diff --git a/package.json b/package.json
index 1206458b..5015bc79 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@polkadot/types-support": "^16.4.6",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "dedot": "^0.16.0",
+    "dedot": "^1.0.0",
     "husky": "^8.0.3",
     "lerna": "^7.4.2",
     "prettier": "^3.3.3",
diff --git a/packages/chaintypes/package.json b/packages/chaintypes/package.json
index 770281a9..248b1b69 100644
--- a/packages/chaintypes/package.json
+++ b/packages/chaintypes/package.json
@@ -18,7 +18,7 @@
     "copy": "cp -R ./src/* ./dist && rm ./dist/index.ts"
   },
   "peerDependencies": {
-    "dedot": ">=0.16.0"
+    "dedot": ">=1.0.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/chaintypes/src/aleph/consts.d.ts b/packages/chaintypes/src/aleph/consts.d.ts
index 51b3512a..6b78abb8 100644
--- a/packages/chaintypes/src/aleph/consts.d.ts
+++ b/packages/chaintypes/src/aleph/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, Perbill } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   PalletContractsEnvironment,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/aleph/errors.d.ts b/packages/chaintypes/src/aleph/errors.d.ts
index 403855f2..35110b4b 100644
--- a/packages/chaintypes/src/aleph/errors.d.ts
+++ b/packages/chaintypes/src/aleph/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,50 +11,50 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -63,32 +63,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -97,57 +97,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `MaxHolds`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -156,146 +156,146 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -304,47 +304,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Elections`'s errors
    **/
   elections: {
-    NotEnoughValidators: GenericPalletError<Rv>;
-    NotEnoughReservedValidators: GenericPalletError<Rv>;
-    NotEnoughNonReservedValidators: GenericPalletError<Rv>;
-    NonUniqueListOfValidators: GenericPalletError<Rv>;
-    NonReservedFinalitySeatsLargerThanNonReservedSeats: GenericPalletError<Rv>;
+    NotEnoughValidators: GenericPalletError;
+    NotEnoughReservedValidators: GenericPalletError;
+    NotEnoughNonReservedValidators: GenericPalletError;
+    NonUniqueListOfValidators: GenericPalletError;
+    NonReservedFinalitySeatsLargerThanNonReservedSeats: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -353,68 +353,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -423,33 +423,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -458,12 +458,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -472,77 +472,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -551,12 +551,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Contracts`'s errors
@@ -565,120 +565,120 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * The output buffer supplied to a contract API call was too small.
      **/
-    OutputBufferTooSmall: GenericPalletError<Rv>;
+    OutputBufferTooSmall: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * The code supplied to `instantiate_with_code` exceeds the limit specified in the
      * current schedule.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * The size defined in `T::MaxValueSize` was exceeded.
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The subject passed to `seal_random` exceeds the limit.
      **/
-    RandomSubjectTooLong: GenericPalletError<Rv>;
+    RandomSubjectTooLong: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * The chain does not provide a chain extension. Calling the chain extension results
      * in this error. Note that this usually shouldn't happen as deploying such contracts
      * is rejected.
      **/
-    NoChainExtension: GenericPalletError<Rv>;
+    NoChainExtension: GenericPalletError;
 
     /**
      * Failed to decode the XCM program.
      **/
-    XcmDecodeFailed: GenericPalletError<Rv>;
+    XcmDecodeFailed: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
@@ -686,22 +686,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * into `pallet-contracts`. This would make the whole pallet reentrant with regard to
      * contract code execution which is not supported.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -709,7 +709,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract's code was found to be invalid during validation.
@@ -721,47 +721,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::contracts=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * An indetermistic code was used in a context where this is not permitted.
      **/
-    Indeterministic: GenericPalletError<Rv>;
+    Indeterministic: GenericPalletError;
 
     /**
      * A pending migration needs to complete before the extrinsic can be called.
      **/
-    MigrationInProgress: GenericPalletError<Rv>;
+    MigrationInProgress: GenericPalletError;
 
     /**
      * Migrate dispatch call was attempted but no migration was performed.
      **/
-    NoMigrationPerformed: GenericPalletError<Rv>;
+    NoMigrationPerformed: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -770,44 +770,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -816,129 +816,129 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -947,137 +947,137 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CommitteeManagement`'s errors
@@ -1089,23 +1089,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * * `underperformed_session_count_threshold` must be a positive number,
      * * `clean_session_counter_delay` must be a positive number.
      **/
-    InvalidBanConfig: GenericPalletError<Rv>;
+    InvalidBanConfig: GenericPalletError;
 
     /**
      * Ban reason is too big, ie given vector of bytes is greater than
      * [`primitives::DEFAULT_BAN_REASON_LENGTH`]
      **/
-    BanReasonTooBig: GenericPalletError<Rv>;
+    BanReasonTooBig: GenericPalletError;
 
     /**
      * Lenient threshold not in [0-100] range
      **/
-    InvalidLenientThreshold: GenericPalletError<Rv>;
+    InvalidLenientThreshold: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -1114,47 +1114,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SafeMode`'s errors
@@ -1163,42 +1163,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The safe-mode is (already or still) entered.
      **/
-    Entered: GenericPalletError<Rv>;
+    Entered: GenericPalletError;
 
     /**
      * The safe-mode is (already or still) exited.
      **/
-    Exited: GenericPalletError<Rv>;
+    Exited: GenericPalletError;
 
     /**
      * This functionality of the pallet is disabled by the configuration.
      **/
-    NotConfigured: GenericPalletError<Rv>;
+    NotConfigured: GenericPalletError;
 
     /**
      * There is no balance reserved.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The account already has a deposit reserved and can therefore not enter or extend again.
      **/
-    AlreadyDeposited: GenericPalletError<Rv>;
+    AlreadyDeposited: GenericPalletError;
 
     /**
      * This deposit cannot be released yet.
      **/
-    CannotReleaseYet: GenericPalletError<Rv>;
+    CannotReleaseYet: GenericPalletError;
 
     /**
      * An error from the underlying `Currency`.
      **/
-    CurrencyError: GenericPalletError<Rv>;
+    CurrencyError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TxPause`'s errors
@@ -1207,22 +1207,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The call is paused.
      **/
-    IsPaused: GenericPalletError<Rv>;
+    IsPaused: GenericPalletError;
 
     /**
      * The call is unpaused.
      **/
-    IsUnpaused: GenericPalletError<Rv>;
+    IsUnpaused: GenericPalletError;
 
     /**
      * The call is whitelisted and cannot be paused.
      **/
-    Unpausable: GenericPalletError<Rv>;
-    NotFound: GenericPalletError<Rv>;
+    Unpausable: GenericPalletError;
+    NotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/aleph/events.d.ts b/packages/chaintypes/src/aleph/events.d.ts
index 22e410b8..4a3a1a7e 100644
--- a/packages/chaintypes/src/aleph/events.d.ts
+++ b/packages/chaintypes/src/aleph/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchInfo, DispatchError, AccountId32, H256, FixedBytes, Result, Perbill, Bytes } from 'dedot/codecs';
 import type {
   FrameSupportTokensMiscBalanceStatus,
@@ -22,7 +22,7 @@ import type {
   PalletSafeModeExitReason,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -30,13 +30,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<Rv, 'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: DispatchInfo }
@@ -45,32 +44,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -79,18 +78,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -100,7 +98,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -110,7 +107,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -120,7 +116,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -129,7 +124,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -138,40 +133,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -180,77 +174,77 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -261,7 +255,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -270,7 +263,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -280,18 +273,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -300,14 +287,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -317,17 +303,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -335,49 +316,43 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * The stakers' rewards are getting paid.
      **/
-    PayoutStarted: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'PayoutStarted',
-      { eraIndex: number; validatorStash: AccountId32 }
-    >;
+    PayoutStarted: GenericPalletEvent<'Staking', 'PayoutStarted', { eraIndex: number; validatorStash: AccountId32 }>;
 
     /**
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -386,22 +361,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -411,31 +386,30 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Aleph`'s events
    **/
   aleph: {
-    ChangeEmergencyFinalizer: GenericPalletEvent<Rv, 'Aleph', 'ChangeEmergencyFinalizer', PrimitivesAppPublic>;
+    ChangeEmergencyFinalizer: GenericPalletEvent<'Aleph', 'ChangeEmergencyFinalizer', PrimitivesAppPublic>;
     ScheduleFinalityVersionChange: GenericPalletEvent<
-      Rv,
       'Aleph',
       'ScheduleFinalityVersionChange',
       PrimitivesVersionChange
     >;
-    FinalityVersionChange: GenericPalletEvent<Rv, 'Aleph', 'FinalityVersionChange', PrimitivesVersionChange>;
-    InflationParametersChange: GenericPalletEvent<Rv, 'Aleph', 'InflationParametersChange', [bigint, bigint]>;
+    FinalityVersionChange: GenericPalletEvent<'Aleph', 'FinalityVersionChange', PrimitivesVersionChange>;
+    InflationParametersChange: GenericPalletEvent<'Aleph', 'InflationParametersChange', [bigint, bigint]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Elections`'s events
@@ -445,7 +419,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Committee for the next era has changed
      **/
     ChangeValidators: GenericPalletEvent<
-      Rv,
       'Elections',
       'ChangeValidators',
       [Array<AccountId32>, Array<AccountId32>, PrimitivesCommitteeSeats]
@@ -454,7 +427,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -463,48 +436,42 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New proposal.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Treasury', 'Proposed', { proposalIndex: number }>;
+    Proposed: GenericPalletEvent<'Treasury', 'Proposed', { proposalIndex: number }>;
 
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * A proposal was rejected; funds were slashed.
      **/
-    Rejected: GenericPalletEvent<Rv, 'Treasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
+    Rejected: GenericPalletEvent<'Treasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -513,18 +480,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       { index: number; assetKind: []; amount: bigint; beneficiary: AccountId32; validFrom: number; expireAt: number }
@@ -533,28 +494,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -564,17 +525,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -584,37 +545,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -624,7 +585,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -634,7 +594,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -644,7 +603,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -660,7 +618,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -669,7 +626,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -679,7 +636,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -694,7 +650,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -713,13 +668,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -733,7 +687,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Contracts`'s events
@@ -742,7 +696,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by address at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
+    Instantiated: GenericPalletEvent<'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
 
     /**
      * Contract has been removed.
@@ -753,7 +707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `seal_terminate`.
      **/
     Terminated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Terminated',
       {
@@ -773,7 +726,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Code with the specified hash has been stored.
      **/
     CodeStored: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeStored',
       { codeHash: H256; depositHeld: bigint; uploader: AccountId32 }
@@ -783,7 +735,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractEmitted',
       {
@@ -804,7 +755,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A code with the specified hash was removed.
      **/
     CodeRemoved: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeRemoved',
       { codeHash: H256; depositReleased: bigint; remover: AccountId32 }
@@ -814,7 +764,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A contract's code was updated.
      **/
     ContractCodeUpdated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractCodeUpdated',
       {
@@ -845,7 +794,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     Called: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Called',
       {
@@ -871,7 +819,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     DelegateCalled: GenericPalletEvent<
-      Rv,
       'Contracts',
       'DelegateCalled',
       {
@@ -892,7 +839,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some funds have been transferred and held as storage deposit.
      **/
     StorageDepositTransferredAndHeld: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndHeld',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -902,7 +848,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some storage deposit funds have been transferred and released.
      **/
     StorageDepositTransferredAndReleased: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndReleased',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -911,7 +856,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -920,13 +865,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -935,12 +879,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -956,7 +895,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -971,7 +909,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -980,13 +917,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -997,14 +933,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * The removal can be voluntary (withdrawn all unbonded funds) or involuntary (kicked).
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'NominationPools', 'MemberRemoved', { poolId: number; member: AccountId32 }>;
+    MemberRemoved: GenericPalletEvent<'NominationPools', 'MemberRemoved', { poolId: number; member: AccountId32 }>;
 
     /**
      * The roles of a pool have been updated to the given new roles. Note that the depositor
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -1013,13 +948,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -1029,7 +963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -1039,7 +972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -1049,7 +981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -1059,7 +990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -1069,7 +999,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -1079,7 +1008,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -1089,7 +1017,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -1098,7 +1025,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1107,23 +1034,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1133,7 +1059,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1142,23 +1067,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1168,7 +1087,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1179,7 +1097,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1188,23 +1105,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1213,19 +1129,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1234,7 +1149,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CommitteeManagement`'s events
@@ -1243,13 +1158,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ban thresholds for the next era has changed
      **/
-    SetBanConfig: GenericPalletEvent<Rv, 'CommitteeManagement', 'SetBanConfig', PrimitivesProductionBanConfig>;
+    SetBanConfig: GenericPalletEvent<'CommitteeManagement', 'SetBanConfig', PrimitivesProductionBanConfig>;
 
     /**
      * Ban thresholds for the next era has changed
      **/
     SetFinalityBanConfig: GenericPalletEvent<
-      Rv,
       'CommitteeManagement',
       'SetFinalityBanConfig',
       PrimitivesFinalityBanConfig
@@ -1258,17 +1172,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Validators have been banned from the committee
      **/
-    BanValidators: GenericPalletEvent<
-      Rv,
-      'CommitteeManagement',
-      'BanValidators',
-      Array<[AccountId32, PrimitivesBanInfo]>
-    >;
+    BanValidators: GenericPalletEvent<'CommitteeManagement', 'BanValidators', Array<[AccountId32, PrimitivesBanInfo]>>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1277,14 +1186,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: AlephRuntimeProxyType; disambiguationIndex: number }
@@ -1293,13 +1201,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AlephRuntimeProxyType; delay: number }
@@ -1309,7 +1216,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AlephRuntimeProxyType; delay: number }
@@ -1318,7 +1224,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SafeMode`'s events
@@ -1327,51 +1233,51 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The safe-mode was entered until inclusively this block.
      **/
-    Entered: GenericPalletEvent<Rv, 'SafeMode', 'Entered', { until: number }>;
+    Entered: GenericPalletEvent<'SafeMode', 'Entered', { until: number }>;
 
     /**
      * The safe-mode was extended until inclusively this block.
      **/
-    Extended: GenericPalletEvent<Rv, 'SafeMode', 'Extended', { until: number }>;
+    Extended: GenericPalletEvent<'SafeMode', 'Extended', { until: number }>;
 
     /**
      * Exited the safe-mode for a specific reason.
      **/
-    Exited: GenericPalletEvent<Rv, 'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
+    Exited: GenericPalletEvent<'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
 
     /**
      * An account reserved funds for either entering or extending the safe-mode.
      **/
-    DepositPlaced: GenericPalletEvent<Rv, 'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
+    DepositPlaced: GenericPalletEvent<'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had a reserve released that was reserved.
      **/
-    DepositReleased: GenericPalletEvent<Rv, 'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
+    DepositReleased: GenericPalletEvent<'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had reserve slashed that was reserved.
      **/
-    DepositSlashed: GenericPalletEvent<Rv, 'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
+    DepositSlashed: GenericPalletEvent<'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
 
     /**
      * Could not hold funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotDeposit: GenericPalletEvent<Rv, 'SafeMode', 'CannotDeposit', null>;
+    CannotDeposit: GenericPalletEvent<'SafeMode', 'CannotDeposit', null>;
 
     /**
      * Could not release funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotRelease: GenericPalletEvent<Rv, 'SafeMode', 'CannotRelease', null>;
+    CannotRelease: GenericPalletEvent<'SafeMode', 'CannotRelease', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TxPause`'s events
@@ -1380,17 +1286,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * This pallet, or a specific call is now paused.
      **/
-    CallPaused: GenericPalletEvent<Rv, 'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
+    CallPaused: GenericPalletEvent<'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * This pallet, or a specific call is now unpaused.
      **/
-    CallUnpaused: GenericPalletEvent<Rv, 'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
+    CallUnpaused: GenericPalletEvent<'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Operations`'s events
@@ -1399,26 +1305,16 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A consumers counter was incremented for an account
      **/
-    ConsumersCounterIncremented: GenericPalletEvent<
-      Rv,
-      'Operations',
-      'ConsumersCounterIncremented',
-      { who: AccountId32 }
-    >;
+    ConsumersCounterIncremented: GenericPalletEvent<'Operations', 'ConsumersCounterIncremented', { who: AccountId32 }>;
 
     /**
      * A consumers counter was decremented for an account
      **/
-    ConsumersCounterDecremented: GenericPalletEvent<
-      Rv,
-      'Operations',
-      'ConsumersCounterDecremented',
-      { who: AccountId32 }
-    >;
+    ConsumersCounterDecremented: GenericPalletEvent<'Operations', 'ConsumersCounterDecremented', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/aleph/index.d.ts b/packages/chaintypes/src/aleph/index.d.ts
index 06bde4fb..939088f2 100644
--- a/packages/chaintypes/src/aleph/index.d.ts
+++ b/packages/chaintypes/src/aleph/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AlephRuntimeRuntimeCall,
@@ -39,26 +39,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameSystemExtensionsCheckWeight,
     PalletTransactionPaymentChargeTransactionPayment,
   ];
-}
-
-export interface VersionedAlephApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: AlephApi
  * @specVersion: 15000000
  **/
-export interface AlephApi {
-  legacy: VersionedAlephApi<RpcLegacy>;
-  v2: VersionedAlephApi<RpcV2>;
+export interface AlephApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/aleph/json-rpc.d.ts b/packages/chaintypes/src/aleph/json-rpc.d.ts
index 602b8554..e20a0915 100644
--- a/packages/chaintypes/src/aleph/json-rpc.d.ts
+++ b/packages/chaintypes/src/aleph/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'alephNode_emergencyFinalize'
   | 'alephNode_getBlockAuthor'
@@ -81,4 +81,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_unstable_submitAndWatch'
   | 'transaction_unstable_unwatch'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/aleph/query.d.ts b/packages/chaintypes/src/aleph/query.d.ts
index 7844fceb..e4b46ecf 100644
--- a/packages/chaintypes/src/aleph/query.d.ts
+++ b/packages/chaintypes/src/aleph/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -77,7 +77,7 @@ import type {
   PalletProxyAnnouncement,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -88,28 +88,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -117,7 +117,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -125,28 +125,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -159,14 +159,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -183,21 +183,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -205,26 +205,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -237,12 +237,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
+    randomMaterial: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -252,7 +252,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -260,7 +260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -271,12 +271,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -287,7 +287,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -296,12 +296,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -312,7 +312,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -322,12 +322,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -338,14 +338,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -376,7 +376,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -385,7 +385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -393,7 +393,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -401,7 +401,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -410,7 +410,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletBalancesIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<PalletBalancesIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -418,7 +417,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -428,18 +427,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -450,12 +449,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -466,14 +465,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -482,7 +481,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -492,28 +491,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -522,7 +521,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -533,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -543,7 +542,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -553,14 +552,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -569,7 +568,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -595,14 +594,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -611,7 +610,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -621,7 +620,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -631,7 +630,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -642,7 +641,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -657,7 +656,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -677,7 +676,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -704,7 +702,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -721,7 +718,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -737,7 +733,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -750,7 +746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -763,7 +758,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -772,7 +767,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -781,14 +776,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -797,7 +792,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -805,7 +800,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -813,7 +808,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -823,7 +818,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -833,7 +828,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -845,7 +839,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -857,7 +850,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -870,7 +862,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -882,7 +873,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * Indices of validators that have offended in the active era and whether they are currently
@@ -897,7 +888,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, boolean]>> =} callback
      **/
-    offendingValidators: GenericStorageQuery<Rv, () => Array<[number, boolean]>>;
+    offendingValidators: GenericStorageQuery<() => Array<[number, boolean]>>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -906,12 +897,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `History`'s storage queries
@@ -923,19 +914,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -946,14 +937,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -961,7 +952,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -969,7 +960,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PrimitivesAlephNodeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PrimitivesAlephNodeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PrimitivesAlephNodeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -980,7 +971,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -988,11 +979,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PrimitivesAlephNodeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PrimitivesAlephNodeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PrimitivesAlephNodeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1001,7 +988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1009,7 +995,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aleph`'s storage queries
@@ -1019,82 +1005,82 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    azeroCap: GenericStorageQuery<Rv, () => bigint>;
+    azeroCap: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    exponentialInflationHorizon: GenericStorageQuery<Rv, () => bigint>;
+    exponentialInflationHorizon: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {Callback<Array<PrimitivesAppPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<PrimitivesAppPublic>>;
+    authorities: GenericStorageQuery<() => Array<PrimitivesAppPublic>>;
 
     /**
      *
      * @param {Callback<Array<PrimitivesAppPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<PrimitivesAppPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<PrimitivesAppPublic>>;
 
     /**
      * Set of account ids that will be used as authorities in the next session
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextFinalityCommittee: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    nextFinalityCommittee: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    emergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
+    emergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    queuedEmergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
+    queuedEmergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    nextEmergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
+    nextEmergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
 
     /**
      * Current finality version.
      *
      * @param {Callback<number> =} callback
      **/
-    finalityVersion: GenericStorageQuery<Rv, () => number>;
+    finalityVersion: GenericStorageQuery<() => number>;
 
     /**
      * Scheduled finality version change.
      *
      * @param {Callback<PrimitivesVersionChange | undefined> =} callback
      **/
-    finalityScheduledVersionChange: GenericStorageQuery<Rv, () => PrimitivesVersionChange | undefined>;
+    finalityScheduledVersionChange: GenericStorageQuery<() => PrimitivesVersionChange | undefined>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PrimitivesScore | undefined> =} callback
      **/
-    abftScores: GenericStorageQuery<Rv, (arg: number) => PrimitivesScore | undefined, number>;
+    abftScores: GenericStorageQuery<(arg: number) => PrimitivesScore | undefined, number>;
 
     /**
      *
      * @param {Callback<number> =} callback
      **/
-    lastScoreNonce: GenericStorageQuery<Rv, () => number>;
+    lastScoreNonce: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Elections`'s storage queries
@@ -1105,35 +1091,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PrimitivesCommitteeSeats> =} callback
      **/
-    committeeSize: GenericStorageQuery<Rv, () => PrimitivesCommitteeSeats>;
+    committeeSize: GenericStorageQuery<() => PrimitivesCommitteeSeats>;
 
     /**
      * Desired size of a committee in effect from a new era.
      *
      * @param {Callback<PrimitivesCommitteeSeats> =} callback
      **/
-    nextEraCommitteeSize: GenericStorageQuery<Rv, () => PrimitivesCommitteeSeats>;
+    nextEraCommitteeSize: GenericStorageQuery<() => PrimitivesCommitteeSeats>;
 
     /**
      * Next era's list of reserved validators.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextEraReservedValidators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    nextEraReservedValidators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current era's list of reserved validators.
      *
      * @param {Callback<PrimitivesEraValidators> =} callback
      **/
-    currentEraValidators: GenericStorageQuery<Rv, () => PrimitivesEraValidators>;
+    currentEraValidators: GenericStorageQuery<() => PrimitivesEraValidators>;
 
     /**
      * Next era's list of non reserved validators.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextEraNonReservedValidators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    nextEraNonReservedValidators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Openness of the elections, whether we allow all candidates that bonded enough tokens or
@@ -1141,12 +1127,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PrimitivesElectionOpenness> =} callback
      **/
-    openness: GenericStorageQuery<Rv, () => PrimitivesElectionOpenness>;
+    openness: GenericStorageQuery<() => PrimitivesElectionOpenness>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1157,7 +1143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -1165,28 +1151,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1194,12 +1180,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1211,11 +1197,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -1224,12 +1206,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1242,7 +1224,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1250,7 +1231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1261,12 +1242,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1278,7 +1259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1286,7 +1267,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1314,7 +1295,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1325,7 +1306,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
     contractInfoOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
       AccountId32
     >;
@@ -1339,7 +1319,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1347,7 +1327,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1355,12 +1335,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -1375,14 +1355,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -1395,7 +1375,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -1403,7 +1383,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -1411,7 +1391,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -1419,7 +1399,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -1428,7 +1408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -1439,7 +1419,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -1449,7 +1428,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -1457,14 +1436,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -1473,14 +1452,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -1489,14 +1468,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -1504,21 +1483,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -1529,14 +1508,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -1544,16 +1523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1569,7 +1544,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -1581,7 +1555,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1593,7 +1567,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1603,7 +1577,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1612,7 +1586,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -1627,7 +1600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1640,12 +1613,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommitteeManagement`'s storage queries
@@ -1655,7 +1628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perquintill> =} callback
      **/
-    lenientThreshold: GenericStorageQuery<Rv, () => Perquintill>;
+    lenientThreshold: GenericStorageQuery<() => Perquintill>;
 
     /**
      * A lookup how many blocks a validator produced.
@@ -1663,21 +1636,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    sessionValidatorBlockCount: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    sessionValidatorBlockCount: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total possible reward per validator for the current era.
      *
      * @param {Callback<PalletCommitteeManagementValidatorTotalRewards | undefined> =} callback
      **/
-    validatorEraTotalReward: GenericStorageQuery<Rv, () => PalletCommitteeManagementValidatorTotalRewards | undefined>;
+    validatorEraTotalReward: GenericStorageQuery<() => PalletCommitteeManagementValidatorTotalRewards | undefined>;
 
     /**
      * Current era config for ban functionality related to block production.
      *
      * @param {Callback<PrimitivesProductionBanConfig> =} callback
      **/
-    productionBanConfig: GenericStorageQuery<Rv, () => PrimitivesProductionBanConfig>;
+    productionBanConfig: GenericStorageQuery<() => PrimitivesProductionBanConfig>;
 
     /**
      * A lookup for a number of underperformance sessions in block production for a given validator
@@ -1685,7 +1658,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    underperformedValidatorSessionCount: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    underperformedValidatorSessionCount: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Validators to be removed from non reserved list in the next era
@@ -1693,7 +1666,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PrimitivesBanInfo | undefined> =} callback
      **/
-    banned: GenericStorageQuery<Rv, (arg: AccountId32Like) => PrimitivesBanInfo | undefined, AccountId32>;
+    banned: GenericStorageQuery<(arg: AccountId32Like) => PrimitivesBanInfo | undefined, AccountId32>;
 
     /**
      * SessionValidators in the current session.
@@ -1701,7 +1674,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCommitteeManagementCurrentAndNextSessionValidators> =} callback
      **/
     currentAndNextSessionValidatorsStorage: GenericStorageQuery<
-      Rv,
       () => PalletCommitteeManagementCurrentAndNextSessionValidators
     >;
 
@@ -1711,19 +1683,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    underperformedFinalizerSessionCount: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    underperformedFinalizerSessionCount: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Current era config for ban functionality related to block finality.
      *
      * @param {Callback<PrimitivesFinalityBanConfig> =} callback
      **/
-    finalityBanConfig: GenericStorageQuery<Rv, () => PrimitivesFinalityBanConfig>;
+    finalityBanConfig: GenericStorageQuery<() => PrimitivesFinalityBanConfig>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1736,11 +1708,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1748,16 +1716,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -1772,7 +1736,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
+    enteredUntil: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -1783,12 +1747,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
+    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -1800,11 +1764,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/aleph/runtime.d.ts b/packages/chaintypes/src/aleph/runtime.d.ts
index aea6c9ff..0b6b92d1 100644
--- a/packages/chaintypes/src/aleph/runtime.d.ts
+++ b/packages/chaintypes/src/aleph/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -44,7 +44,7 @@ import type {
   PalletContractsPrimitivesContractAccessError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -54,7 +54,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -62,7 +62,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header.
@@ -70,12 +70,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -86,7 +86,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -97,7 +97,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -106,12 +106,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -127,7 +127,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -138,7 +137,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -147,7 +146,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -159,14 +157,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -189,7 +186,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -202,7 +198,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
@@ -215,19 +211,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -239,12 +235,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -262,7 +258,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -273,14 +269,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -292,12 +287,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -310,7 +305,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -321,7 +315,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -330,19 +323,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AlephSessionApi - 0x2be3f75b696ad1f6
@@ -353,7 +346,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AlephSessionApi_next_session_authorities
      **/
     nextSessionAuthorities: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Result<Array<PrimitivesAppPublic>, PrimitivesApiError>>
     >;
 
@@ -361,14 +353,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AlephSessionApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<PrimitivesAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<PrimitivesAppPublic>>>;
 
     /**
      *
      * @callname: AlephSessionApi_next_session_authority_data
      **/
     nextSessionAuthorityData: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Result<PrimitivesSessionAuthorityData, PrimitivesApiError>>
     >;
 
@@ -376,37 +367,37 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AlephSessionApi_authority_data
      **/
-    authorityData: GenericRuntimeApiMethod<Rv, () => Promise<PrimitivesSessionAuthorityData>>;
+    authorityData: GenericRuntimeApiMethod<() => Promise<PrimitivesSessionAuthorityData>>;
 
     /**
      *
      * @callname: AlephSessionApi_session_period
      **/
-    sessionPeriod: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    sessionPeriod: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      *
      * @callname: AlephSessionApi_millisecs_per_block
      **/
-    millisecsPerBlock: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    millisecsPerBlock: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      *
      * @callname: AlephSessionApi_finality_version
      **/
-    finalityVersion: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    finalityVersion: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      *
      * @callname: AlephSessionApi_next_session_finality_version
      **/
-    nextSessionFinalityVersion: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    nextSessionFinalityVersion: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      *
      * @callname: AlephSessionApi_score_submission_period
      **/
-    scoreSubmissionPeriod: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    scoreSubmissionPeriod: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Predict finality committee and block producers for the given session. `session` must be
@@ -421,7 +412,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session
      **/
     predictSessionCommittee: GenericRuntimeApiMethod<
-      Rv,
       (session: number) => Promise<Result<PrimitivesSessionCommittee, PrimitivesSessionValidatorError>>
     >;
 
@@ -430,7 +420,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AlephSessionApi_next_session_aura_authorities
      **/
     nextSessionAuraAuthorities: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[AccountId32, SpConsensusAuraSr25519AppSr25519Public]>>
     >;
 
@@ -442,21 +431,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AlephSessionApi_key_owner
      * @param {PrimitivesAppPublic} key
      **/
-    keyOwner: GenericRuntimeApiMethod<Rv, (key: PrimitivesAppPublic) => Promise<AccountId32 | undefined>>;
+    keyOwner: GenericRuntimeApiMethod<(key: PrimitivesAppPublic) => Promise<AccountId32 | undefined>>;
 
     /**
      * Returns inflation from now to now + 1 year. Capped at 100%
      *
      * @callname: AlephSessionApi_yearly_inflation
      **/
-    yearlyInflation: GenericRuntimeApiMethod<Rv, () => Promise<Perbill>>;
+    yearlyInflation: GenericRuntimeApiMethod<() => Promise<Perbill>>;
 
     /**
      * Returns payout. First tuple item is a validators payout, 2nd is the rest.
      *
      * @callname: AlephSessionApi_current_era_payout
      **/
-    currentEraPayout: GenericRuntimeApiMethod<Rv, () => Promise<[bigint, bigint]>>;
+    currentEraPayout: GenericRuntimeApiMethod<() => Promise<[bigint, bigint]>>;
 
     /**
      * Submits score for a nonce in a session of performance of finality committee members.
@@ -466,14 +455,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PrimitivesCryptoSignatureSet} signature
      **/
     submitAbftScore: GenericRuntimeApiMethod<
-      Rv,
       (score: PrimitivesScore, signature: PrimitivesCryptoSignatureSet) => Promise<[] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -485,7 +473,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -494,7 +482,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -503,12 +491,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -520,7 +508,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator in a given era.
@@ -529,12 +517,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ContractsApi - 0x68b66ba122c93fa7
@@ -554,7 +542,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: AccountId32Like,
@@ -580,7 +567,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -604,7 +590,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -625,7 +610,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: AccountId32Like,
         key: BytesLike,
@@ -635,7 +619,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -649,7 +633,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_create_default_config
      **/
-    createDefaultConfig: GenericRuntimeApiMethod<Rv, () => Promise<Bytes>>;
+    createDefaultConfig: GenericRuntimeApiMethod<() => Promise<Bytes>>;
 
     /**
      * Build `GenesisConfig` from a JSON blob not using any defaults and store it in the storage.
@@ -663,11 +647,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_config
      * @param {BytesLike} json
      **/
-    buildConfig: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildConfig: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/aleph/tx.d.ts b/packages/chaintypes/src/aleph/tx.d.ts
index c06360d9..d4df0552 100644
--- a/packages/chaintypes/src/aleph/tx.d.ts
+++ b/packages/chaintypes/src/aleph/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -57,16 +55,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AlephRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AlephRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -77,16 +77,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -96,16 +95,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -115,16 +113,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -134,16 +131,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -153,16 +149,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -172,16 +167,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -192,19 +186,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -214,16 +207,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -233,16 +225,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -252,16 +243,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -271,23 +261,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -302,14 +291,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -321,7 +308,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -332,19 +320,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -358,7 +345,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -366,7 +352,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -379,7 +364,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -389,16 +375,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -411,14 +396,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -430,7 +413,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -444,7 +428,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -452,7 +435,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -465,14 +447,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -484,23 +467,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -513,19 +495,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -537,20 +518,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -561,19 +541,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -584,19 +563,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -607,19 +585,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -629,16 +606,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -649,26 +625,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -681,19 +656,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -703,16 +677,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -722,16 +695,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -741,16 +713,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -760,16 +731,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -779,16 +749,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -797,15 +766,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -815,16 +783,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -833,15 +800,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -851,16 +817,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -870,16 +835,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -889,16 +853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -907,15 +870,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -924,15 +886,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -942,16 +903,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -962,19 +922,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -983,15 +942,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1002,19 +960,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1025,19 +982,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1047,16 +1003,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1067,19 +1022,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1089,16 +1043,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1113,7 +1066,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPerbill} minCommission
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -1122,7 +1074,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         chillThreshold: PalletStakingPalletConfigOpPercent,
         minCommission: PalletStakingPalletConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -1136,7 +1087,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               minCommission: PalletStakingPalletConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1146,16 +1098,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1165,16 +1116,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1184,16 +1134,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1205,20 +1154,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1228,16 +1176,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1247,23 +1194,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1276,19 +1222,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PrimitivesAlephNodeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PrimitivesAlephNodeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1297,22 +1242,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Aleph`'s transaction calls
@@ -1324,16 +1268,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PrimitivesAppPublic} emergencyFinalizer
      **/
     setEmergencyFinalizer: GenericTxCall<
-      Rv,
       (emergencyFinalizer: PrimitivesAppPublic) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Aleph';
           palletCall: {
             name: 'SetEmergencyFinalizer';
             params: { emergencyFinalizer: PrimitivesAppPublic };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1344,19 +1287,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} session
      **/
     scheduleFinalityVersionChange: GenericTxCall<
-      Rv,
       (
         versionIncoming: number,
         session: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Aleph';
           palletCall: {
             name: 'ScheduleFinalityVersionChange';
             params: { versionIncoming: number; session: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1367,19 +1309,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} horizonMillisecs
      **/
     setInflationParameters: GenericTxCall<
-      Rv,
       (
         azeroCap: bigint | undefined,
         horizonMillisecs: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Aleph';
           palletCall: {
             name: 'SetInflationParameters';
             params: { azeroCap: bigint | undefined; horizonMillisecs: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1390,26 +1331,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PrimitivesCryptoSignatureSet} signature
      **/
     unsignedSubmitAbftScore: GenericTxCall<
-      Rv,
       (
         score: PrimitivesScore,
         signature: PrimitivesCryptoSignatureSet,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Aleph';
           palletCall: {
             name: 'UnsignedSubmitAbftScore';
             params: { score: PrimitivesScore; signature: PrimitivesCryptoSignatureSet };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Elections`'s transaction calls
@@ -1423,13 +1363,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PrimitivesCommitteeSeats | undefined} committeeSize
      **/
     changeValidators: GenericTxCall<
-      Rv,
       (
         reservedValidators: Array<AccountId32Like> | undefined,
         nonReservedValidators: Array<AccountId32Like> | undefined,
         committeeSize: PrimitivesCommitteeSeats | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
@@ -1440,7 +1378,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               committeeSize: PrimitivesCommitteeSeats | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1450,23 +1389,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PrimitivesElectionOpenness} openness
      **/
     setElectionsOpenness: GenericTxCall<
-      Rv,
       (openness: PrimitivesElectionOpenness) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'SetElectionsOpenness';
             params: { openness: PrimitivesElectionOpenness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -1479,19 +1417,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     proposeSpend: GenericTxCall<
-      Rv,
       (
         value: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'ProposeSpend';
             params: { value: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1501,16 +1438,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     rejectProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RejectProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1520,16 +1456,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     approveProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'ApproveProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1540,19 +1475,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1562,16 +1496,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1584,21 +1517,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: [],
         amount: bigint,
         beneficiary: AccountId32Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Spend';
             params: { assetKind: []; amount: bigint; beneficiary: AccountId32Like; validFrom: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1608,16 +1540,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1627,16 +1558,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1646,23 +1576,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1673,15 +1602,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1691,16 +1619,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1711,19 +1638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1735,20 +1661,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1759,19 +1684,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1782,26 +1706,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1813,16 +1736,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AlephRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AlephRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AlephRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1833,19 +1755,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AlephRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1855,16 +1776,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AlephRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AlephRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AlephRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1875,19 +1795,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AlephRuntimeOriginCaller,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AlephRuntimeOriginCaller; call: AlephRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1897,16 +1816,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AlephRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AlephRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AlephRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1917,26 +1835,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AlephRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AlephRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -1949,19 +1866,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AlephRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1975,7 +1891,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -1983,7 +1898,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AlephRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -1996,7 +1910,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2010,7 +1925,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2018,7 +1932,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2031,7 +1944,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2044,14 +1958,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2063,14 +1975,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -2082,16 +1995,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: AlephRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: AlephRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2102,19 +2014,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: AlephRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: AlephRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2124,16 +2035,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2144,19 +2054,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: AlephRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2165,22 +2074,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Contracts`'s transaction calls
@@ -2196,7 +2104,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     callOldWeight: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -2204,7 +2111,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2217,7 +2123,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2232,7 +2139,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCodeOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -2241,7 +2147,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2255,7 +2160,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2270,7 +2176,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -2279,7 +2184,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2293,7 +2197,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2305,13 +2210,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint | undefined,
         determinism: PalletContractsWasmDeterminism,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2322,7 +2225,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               determinism: PalletContractsWasmDeterminism;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2332,16 +2236,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2352,19 +2255,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'SetCode';
             params: { dest: MultiAddressLike; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2378,7 +2280,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -2386,7 +2287,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2399,7 +2299,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2414,7 +2315,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -2423,7 +2323,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2437,7 +2336,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2452,7 +2352,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -2461,7 +2360,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -2475,7 +2373,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2485,23 +2384,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     migrate: GenericTxCall<
-      Rv,
       (weightLimit: SpWeightsWeightV2Weight) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'Migrate';
             params: { weightLimit: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -2514,19 +2412,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2536,16 +2433,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2554,15 +2450,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2573,19 +2468,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2596,19 +2490,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2619,19 +2512,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2644,21 +2536,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2672,7 +2563,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -2680,7 +2570,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -2693,7 +2582,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2704,19 +2594,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2727,19 +2616,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2750,19 +2638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2777,7 +2664,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -2786,7 +2672,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -2800,7 +2685,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2813,14 +2699,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -2832,7 +2716,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2842,16 +2727,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2862,19 +2746,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2884,16 +2767,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2903,16 +2785,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2923,19 +2804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2946,19 +2826,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2969,19 +2848,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2991,16 +2869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3010,16 +2887,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3030,26 +2906,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -3061,16 +2936,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3080,16 +2954,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3099,16 +2972,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3117,15 +2989,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3136,19 +3007,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3158,16 +3028,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3178,19 +3047,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3201,19 +3069,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3224,19 +3091,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3249,21 +3115,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3273,16 +3138,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3293,19 +3157,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3316,19 +3179,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3338,16 +3200,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3356,15 +3217,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3376,20 +3236,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3399,16 +3258,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (authority: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3420,20 +3278,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetUsernameFor';
             params: { who: MultiAddressLike; username: BytesLike; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3443,16 +3300,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3462,16 +3318,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3481,16 +3336,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3500,23 +3354,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeDanglingUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveDanglingUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CommitteeManagement`'s transaction calls
@@ -3531,14 +3384,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} banPeriod
      **/
     setBanConfig: GenericTxCall<
-      Rv,
       (
         minimalExpectedPerformance: number | undefined,
         underperformedSessionCountThreshold: number | undefined,
         cleanSessionCounterDelay: number | undefined,
         banPeriod: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommitteeManagement';
           palletCall: {
@@ -3550,7 +3401,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               banPeriod: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3561,19 +3413,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} banReason
      **/
     banFromCommittee: GenericTxCall<
-      Rv,
       (
         banned: AccountId32Like,
         banReason: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommitteeManagement';
           palletCall: {
             name: 'BanFromCommittee';
             params: { banned: AccountId32Like; banReason: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3583,16 +3434,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} banned
      **/
     cancelBan: GenericTxCall<
-      Rv,
       (banned: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommitteeManagement';
           palletCall: {
             name: 'CancelBan';
             params: { banned: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3602,16 +3452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} thresholdPercent
      **/
     setLenientThreshold: GenericTxCall<
-      Rv,
       (thresholdPercent: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommitteeManagement';
           palletCall: {
             name: 'SetLenientThreshold';
             params: { thresholdPercent: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3624,14 +3473,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} cleanSessionCounterDelay
      **/
     setFinalityBanConfig: GenericTxCall<
-      Rv,
       (
         minimalExpectedPerformance: number | undefined,
         underperformedSessionCountThreshold: number | undefined,
         banPeriod: number | undefined,
         cleanSessionCounterDelay: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommitteeManagement';
           palletCall: {
@@ -3643,14 +3490,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               cleanSessionCounterDelay: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -3664,13 +3512,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AlephRuntimeProxyType | undefined,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3681,7 +3527,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3693,20 +3540,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AlephRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AlephRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3718,20 +3564,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AlephRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AlephRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3740,15 +3585,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3760,20 +3604,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AlephRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AlephRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3787,7 +3630,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AlephRuntimeProxyType,
@@ -3795,7 +3637,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3808,7 +3649,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3819,19 +3661,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3842,19 +3683,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3865,19 +3705,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3890,14 +3729,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AlephRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AlephRuntimeProxyType | undefined,
         call: AlephRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3909,14 +3746,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AlephRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SafeMode`'s transaction calls
@@ -3927,15 +3765,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     enter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Enter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3944,15 +3781,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceEnter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceEnter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3961,15 +3797,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     extend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Extend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3978,15 +3813,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExtend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExtend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3995,15 +3829,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4014,19 +3847,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceSlashDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceSlashDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4037,19 +3869,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     releaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4060,26 +3891,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceReleaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TxPause`'s transaction calls
@@ -4091,16 +3921,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} fullName
      **/
     pause: GenericTxCall<
-      Rv,
       (fullName: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Pause';
             params: { fullName: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4110,23 +3939,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} ident
      **/
     unpause: GenericTxCall<
-      Rv,
       (ident: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Unpause';
             params: { ident: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Operations`'s transaction calls
@@ -4138,22 +3966,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     fixAccountsConsumersCounter: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Operations';
           palletCall: {
             name: 'FixAccountsConsumersCounter';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/aleph/view-functions.d.ts b/packages/chaintypes/src/aleph/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/aleph/view-functions.d.ts
+++ b/packages/chaintypes/src/aleph/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/astar/consts.d.ts b/packages/chaintypes/src/astar/consts.d.ts
index 6920b9e8..1bf656e5 100644
--- a/packages/chaintypes/src/astar/consts.d.ts
+++ b/packages/chaintypes/src/astar/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, FixedU128, AccountId32, Perbill, Permill } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -15,7 +15,7 @@ import type {
   FrameSupportPalletId,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/astar/errors.d.ts b/packages/chaintypes/src/astar/errors.d.ts
index e5ab08fd..6cae3cac 100644
--- a/packages/chaintypes/src/astar/errors.d.ts
+++ b/packages/chaintypes/src/astar/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -68,12 +68,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -82,158 +82,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -242,77 +242,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -321,47 +321,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -370,32 +370,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -404,48 +404,48 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * No code upgrade has been authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The given code upgrade has not been authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -454,67 +454,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -523,33 +523,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Inflation`'s errors
@@ -558,12 +558,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sum of all parts must be one whole (100%).
      **/
-    InvalidInflationParameters: GenericPalletError<Rv>;
+    InvalidInflationParameters: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DappStaking`'s errors
@@ -572,194 +572,194 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pallet is disabled/in maintenance mode.
      **/
-    Disabled: GenericPalletError<Rv>;
+    Disabled: GenericPalletError;
 
     /**
      * Smart contract already exists within dApp staking protocol.
      **/
-    ContractAlreadyExists: GenericPalletError<Rv>;
+    ContractAlreadyExists: GenericPalletError;
 
     /**
      * Maximum number of smart contracts has been reached.
      **/
-    ExceededMaxNumberOfContracts: GenericPalletError<Rv>;
+    ExceededMaxNumberOfContracts: GenericPalletError;
 
     /**
      * Not possible to assign a new dApp Id.
      * This should never happen since current type can support up to 65536 - 1 unique dApps.
      **/
-    NewDAppIdUnavailable: GenericPalletError<Rv>;
+    NewDAppIdUnavailable: GenericPalletError;
 
     /**
      * Specified smart contract does not exist in dApp staking.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * Call origin is not dApp owner.
      **/
-    OriginNotOwner: GenericPalletError<Rv>;
+    OriginNotOwner: GenericPalletError;
 
     /**
      * Performing locking or staking with 0 amount.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Total locked amount for staker is below minimum threshold.
      **/
-    LockedAmountBelowThreshold: GenericPalletError<Rv>;
+    LockedAmountBelowThreshold: GenericPalletError;
 
     /**
      * Account is not allowed to participate in dApp staking due to some external reason (e.g. account is already a collator).
      **/
-    AccountNotAvailableForDappStaking: GenericPalletError<Rv>;
+    AccountNotAvailableForDappStaking: GenericPalletError;
 
     /**
      * Cannot add additional unlocking chunks due to capacity limit.
      **/
-    TooManyUnlockingChunks: GenericPalletError<Rv>;
+    TooManyUnlockingChunks: GenericPalletError;
 
     /**
      * Remaining stake prevents entire balance of starting the unlocking process.
      **/
-    RemainingStakePreventsFullUnlock: GenericPalletError<Rv>;
+    RemainingStakePreventsFullUnlock: GenericPalletError;
 
     /**
      * There are no eligible unlocked chunks to claim. This can happen either if no eligible chunks exist, or if user has no chunks at all.
      **/
-    NoUnlockedChunksToClaim: GenericPalletError<Rv>;
+    NoUnlockedChunksToClaim: GenericPalletError;
 
     /**
      * There are no unlocking chunks available to relock.
      **/
-    NoUnlockingChunks: GenericPalletError<Rv>;
+    NoUnlockingChunks: GenericPalletError;
 
     /**
      * The amount being staked is too large compared to what's available for staking.
      **/
-    UnavailableStakeFunds: GenericPalletError<Rv>;
+    UnavailableStakeFunds: GenericPalletError;
 
     /**
      * There are unclaimed rewards remaining from past eras or periods. They should be claimed before attempting any stake modification again.
      **/
-    UnclaimedRewards: GenericPalletError<Rv>;
+    UnclaimedRewards: GenericPalletError;
 
     /**
      * An unexpected error occurred while trying to stake.
      **/
-    InternalStakeError: GenericPalletError<Rv>;
+    InternalStakeError: GenericPalletError;
 
     /**
      * Total staked amount on contract is below the minimum required value.
      **/
-    InsufficientStakeAmount: GenericPalletError<Rv>;
+    InsufficientStakeAmount: GenericPalletError;
 
     /**
      * Stake operation is rejected since period ends in the next era.
      **/
-    PeriodEndsInNextEra: GenericPalletError<Rv>;
+    PeriodEndsInNextEra: GenericPalletError;
 
     /**
      * Unstaking is rejected since the period in which past stake was active has passed.
      **/
-    UnstakeFromPastPeriod: GenericPalletError<Rv>;
+    UnstakeFromPastPeriod: GenericPalletError;
 
     /**
      * Unstake amount is greater than the staked amount.
      **/
-    UnstakeAmountTooLarge: GenericPalletError<Rv>;
+    UnstakeAmountTooLarge: GenericPalletError;
 
     /**
      * Account has no staking information for the contract.
      **/
-    NoStakingInfo: GenericPalletError<Rv>;
+    NoStakingInfo: GenericPalletError;
 
     /**
      * An unexpected error occurred while trying to unstake.
      **/
-    InternalUnstakeError: GenericPalletError<Rv>;
+    InternalUnstakeError: GenericPalletError;
 
     /**
      * Rewards are no longer claimable since they are too old.
      **/
-    RewardExpired: GenericPalletError<Rv>;
+    RewardExpired: GenericPalletError;
 
     /**
      * Reward payout has failed due to an unexpected reason.
      **/
-    RewardPayoutFailed: GenericPalletError<Rv>;
+    RewardPayoutFailed: GenericPalletError;
 
     /**
      * There are no claimable rewards.
      **/
-    NoClaimableRewards: GenericPalletError<Rv>;
+    NoClaimableRewards: GenericPalletError;
 
     /**
      * An unexpected error occurred while trying to claim staker rewards.
      **/
-    InternalClaimStakerError: GenericPalletError<Rv>;
+    InternalClaimStakerError: GenericPalletError;
 
     /**
      * Account is has no eligible stake amount for bonus reward.
      **/
-    NotEligibleForBonusReward: GenericPalletError<Rv>;
+    NotEligibleForBonusReward: GenericPalletError;
 
     /**
      * An unexpected error occurred while trying to claim bonus reward.
      **/
-    InternalClaimBonusError: GenericPalletError<Rv>;
+    InternalClaimBonusError: GenericPalletError;
 
     /**
      * Claim era is invalid - it must be in history, and rewards must exist for it.
      **/
-    InvalidClaimEra: GenericPalletError<Rv>;
+    InvalidClaimEra: GenericPalletError;
 
     /**
      * No dApp tier info exists for the specified era. This can be because era has expired
      * or because during the specified era there were no eligible rewards or protocol wasn't active.
      **/
-    NoDAppTierInfo: GenericPalletError<Rv>;
+    NoDAppTierInfo: GenericPalletError;
 
     /**
      * An unexpected error occurred while trying to claim dApp reward.
      **/
-    InternalClaimDAppError: GenericPalletError<Rv>;
+    InternalClaimDAppError: GenericPalletError;
 
     /**
      * Contract is still active, not unregistered.
      **/
-    ContractStillActive: GenericPalletError<Rv>;
+    ContractStillActive: GenericPalletError;
 
     /**
      * There are too many contract stake entries for the account. This can be cleaned up by either unstaking or cleaning expired entries.
      **/
-    TooManyStakedContracts: GenericPalletError<Rv>;
+    TooManyStakedContracts: GenericPalletError;
 
     /**
      * There are no expired entries to cleanup for the account.
      **/
-    NoExpiredEntries: GenericPalletError<Rv>;
+    NoExpiredEntries: GenericPalletError;
 
     /**
      * Force call is not allowed in production.
      **/
-    ForceNotAllowed: GenericPalletError<Rv>;
+    ForceNotAllowed: GenericPalletError;
 
     /**
      * Invalid tier parameters were provided. This can happen if any number exceeds 100% or if number of elements does not match the number of tiers.
      **/
-    InvalidTierParams: GenericPalletError<Rv>;
+    InvalidTierParams: GenericPalletError;
 
     /**
      * Same contract specified as source and destination.
      **/
-    SameContracts: GenericPalletError<Rv>;
+    SameContracts: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -768,115 +768,115 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Oracle`'s errors
@@ -885,17 +885,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender does not have permission
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Feeder has already feeded at this block
      **/
-    AlreadyFeeded: GenericPalletError<Rv>;
+    AlreadyFeeded: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OracleMembership`'s errors
@@ -904,22 +904,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Too many members.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -928,82 +928,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many candidates
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Too few candidates
      **/
-    TooFewCandidates: GenericPalletError<Rv>;
+    TooFewCandidates: GenericPalletError;
 
     /**
      * Unknown error
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * Permission issue
      **/
-    Permission: GenericPalletError<Rv>;
+    Permission: GenericPalletError;
 
     /**
      * User is already a candidate
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * User is not a candidate
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * User is already an Invulnerable
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * User is not an Invulnerable
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Account is now allowed to be a candidate due to an external reason (e.g. it might be participating in dApp staking)
      **/
-    NotAllowedCandidate: GenericPalletError<Rv>;
+    NotAllowedCandidate: GenericPalletError;
 
     /**
      * The candidacy bond is currently in the un-bonding period.
      **/
-    BondStillLocked: GenericPalletError<Rv>;
+    BondStillLocked: GenericPalletError;
 
     /**
      * No candidacy bond available for withdrawal.
      **/
-    NoCandidacyBond: GenericPalletError<Rv>;
+    NoCandidacyBond: GenericPalletError;
 
     /**
      * User has already submitted an application
      **/
-    PendingApplicationExists: GenericPalletError<Rv>;
+    PendingApplicationExists: GenericPalletError;
 
     /**
      * No candidacy application found
      **/
-    NoApplicationFound: GenericPalletError<Rv>;
+    NoApplicationFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -1012,32 +1012,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -1046,32 +1046,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -1081,129 +1081,129 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcAssetConfig`'s errors
@@ -1212,22 +1212,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset is already registered.
      **/
-    AssetAlreadyRegistered: GenericPalletError<Rv>;
+    AssetAlreadyRegistered: GenericPalletError;
 
     /**
      * Asset does not exist (hasn't been registered).
      **/
-    AssetDoesNotExist: GenericPalletError<Rv>;
+    AssetDoesNotExist: GenericPalletError;
 
     /**
      * Failed to convert to latest versioned Location
      **/
-    MultiLocationNotSupported: GenericPalletError<Rv>;
+    MultiLocationNotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XTokens`'s errors
@@ -1236,110 +1236,110 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset has no reserve location.
      **/
-    AssetHasNoReserve: GenericPalletError<Rv>;
+    AssetHasNoReserve: GenericPalletError;
 
     /**
      * Not cross-chain transfer.
      **/
-    NotCrossChainTransfer: GenericPalletError<Rv>;
+    NotCrossChainTransfer: GenericPalletError;
 
     /**
      * Invalid transfer destination.
      **/
-    InvalidDest: GenericPalletError<Rv>;
+    InvalidDest: GenericPalletError;
 
     /**
      * Currency is not cross-chain transferable.
      **/
-    NotCrossChainTransferableCurrency: GenericPalletError<Rv>;
+    NotCrossChainTransferableCurrency: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * XCM execution failed.
      **/
-    XcmExecutionFailed: GenericPalletError<Rv>;
+    XcmExecutionFailed: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the
      * destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Could not get ancestry of asset reserve location.
      **/
-    InvalidAncestry: GenericPalletError<Rv>;
+    InvalidAncestry: GenericPalletError;
 
     /**
      * The Asset is invalid.
      **/
-    InvalidAsset: GenericPalletError<Rv>;
+    InvalidAsset: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * We tried sending distinct asset and fee but they have different
      * reserve chains.
      **/
-    DistinctReserveForAssetAndFee: GenericPalletError<Rv>;
+    DistinctReserveForAssetAndFee: GenericPalletError;
 
     /**
      * The fee is zero.
      **/
-    ZeroFee: GenericPalletError<Rv>;
+    ZeroFee: GenericPalletError;
 
     /**
      * The transfering asset amount is zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * The number of assets to be sent is over the maximum.
      **/
-    TooManyAssetsBeingSent: GenericPalletError<Rv>;
+    TooManyAssetsBeingSent: GenericPalletError;
 
     /**
      * The specified index does not exist in a Assets struct.
      **/
-    AssetIndexNonExistent: GenericPalletError<Rv>;
+    AssetIndexNonExistent: GenericPalletError;
 
     /**
      * Fee is not enough.
      **/
-    FeeNotEnough: GenericPalletError<Rv>;
+    FeeNotEnough: GenericPalletError;
 
     /**
      * Not supported Location
      **/
-    NotSupportedLocation: GenericPalletError<Rv>;
+    NotSupportedLocation: GenericPalletError;
 
     /**
      * MinXcmFee not registered for certain reserve location
      **/
-    MinXcmFeeNotDefined: GenericPalletError<Rv>;
+    MinXcmFeeNotDefined: GenericPalletError;
 
     /**
      * Asset transfer is limited by RateLimiter.
      **/
-    RateLimited: GenericPalletError<Rv>;
+    RateLimited: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -1349,32 +1349,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -1382,24 +1382,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVM`'s errors
@@ -1408,72 +1408,72 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not enough balance to perform action
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * Calculating total fee overflowed
      **/
-    FeeOverflow: GenericPalletError<Rv>;
+    FeeOverflow: GenericPalletError;
 
     /**
      * Calculating total payment overflowed
      **/
-    PaymentOverflow: GenericPalletError<Rv>;
+    PaymentOverflow: GenericPalletError;
 
     /**
      * Withdraw fee failed
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Gas price is too low.
      **/
-    GasPriceTooLow: GenericPalletError<Rv>;
+    GasPriceTooLow: GenericPalletError;
 
     /**
      * Nonce is invalid
      **/
-    InvalidNonce: GenericPalletError<Rv>;
+    InvalidNonce: GenericPalletError;
 
     /**
      * Gas limit is too low.
      **/
-    GasLimitTooLow: GenericPalletError<Rv>;
+    GasLimitTooLow: GenericPalletError;
 
     /**
      * Gas limit is too high.
      **/
-    GasLimitTooHigh: GenericPalletError<Rv>;
+    GasLimitTooHigh: GenericPalletError;
 
     /**
      * The chain id is invalid.
      **/
-    InvalidChainId: GenericPalletError<Rv>;
+    InvalidChainId: GenericPalletError;
 
     /**
      * the signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * EVM reentrancy
      **/
-    Reentrancy: GenericPalletError<Rv>;
+    Reentrancy: GenericPalletError;
 
     /**
      * EIP-3607,
      **/
-    TransactionMustComeFromEOA: GenericPalletError<Rv>;
+    TransactionMustComeFromEOA: GenericPalletError;
 
     /**
      * Undefined error.
      **/
-    Undefined: GenericPalletError<Rv>;
+    Undefined: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Ethereum`'s errors
@@ -1482,17 +1482,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Pre-log is present, therefore transact is not allowed.
      **/
-    PreLogExists: GenericPalletError<Rv>;
+    PreLogExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s errors
@@ -1501,12 +1501,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Specified value is outside of the allowed range.
      **/
-    ValueOutOfBounds: GenericPalletError<Rv>;
+    ValueOutOfBounds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Contracts`'s errors
@@ -1515,120 +1515,120 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * The output buffer supplied to a contract API call was too small.
      **/
-    OutputBufferTooSmall: GenericPalletError<Rv>;
+    OutputBufferTooSmall: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * The code supplied to `instantiate_with_code` exceeds the limit specified in the
      * current schedule.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * The size defined in `T::MaxValueSize` was exceeded.
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The subject passed to `seal_random` exceeds the limit.
      **/
-    RandomSubjectTooLong: GenericPalletError<Rv>;
+    RandomSubjectTooLong: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * The chain does not provide a chain extension. Calling the chain extension results
      * in this error. Note that this usually shouldn't happen as deploying such contracts
      * is rejected.
      **/
-    NoChainExtension: GenericPalletError<Rv>;
+    NoChainExtension: GenericPalletError;
 
     /**
      * Failed to decode the XCM program.
      **/
-    XcmDecodeFailed: GenericPalletError<Rv>;
+    XcmDecodeFailed: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
@@ -1636,27 +1636,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * into `pallet-contracts`. This would make the whole pallet reentrant with regard to
      * contract code execution which is not supported.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -1664,7 +1664,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract's code was found to be invalid during validation.
@@ -1676,52 +1676,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::contracts=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * An indeterministic code was used in a context where this is not permitted.
      **/
-    Indeterministic: GenericPalletError<Rv>;
+    Indeterministic: GenericPalletError;
 
     /**
      * A pending migration needs to complete before the extrinsic can be called.
      **/
-    MigrationInProgress: GenericPalletError<Rv>;
+    MigrationInProgress: GenericPalletError;
 
     /**
      * Migrate dispatch call was attempted but no migration was performed.
      **/
-    NoMigrationPerformed: GenericPalletError<Rv>;
+    NoMigrationPerformed: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -1730,47 +1730,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -1779,12 +1779,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CouncilMembership`'s errors
@@ -1793,22 +1793,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Too many members.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommitteeMembership`'s errors
@@ -1817,22 +1817,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Too many members.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CommunityCouncilMembership`'s errors
@@ -1841,22 +1841,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Too many members.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Council`'s errors
@@ -1865,67 +1865,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommittee`'s errors
@@ -1934,67 +1934,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CommunityCouncil`'s errors
@@ -2003,67 +2003,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Democracy`'s errors
@@ -2072,128 +2072,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Value too low
      **/
-    ValueLow: GenericPalletError<Rv>;
+    ValueLow: GenericPalletError;
 
     /**
      * Proposal does not exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Cannot cancel the same proposal twice
      **/
-    AlreadyCanceled: GenericPalletError<Rv>;
+    AlreadyCanceled: GenericPalletError;
 
     /**
      * Proposal already made
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal still blacklisted
      **/
-    ProposalBlacklisted: GenericPalletError<Rv>;
+    ProposalBlacklisted: GenericPalletError;
 
     /**
      * Next external proposal not simple majority
      **/
-    NotSimpleMajority: GenericPalletError<Rv>;
+    NotSimpleMajority: GenericPalletError;
 
     /**
      * Invalid hash
      **/
-    InvalidHash: GenericPalletError<Rv>;
+    InvalidHash: GenericPalletError;
 
     /**
      * No external proposal
      **/
-    NoProposal: GenericPalletError<Rv>;
+    NoProposal: GenericPalletError;
 
     /**
      * Identity may not veto a proposal twice
      **/
-    AlreadyVetoed: GenericPalletError<Rv>;
+    AlreadyVetoed: GenericPalletError;
 
     /**
      * Vote given for invalid referendum
      **/
-    ReferendumInvalid: GenericPalletError<Rv>;
+    ReferendumInvalid: GenericPalletError;
 
     /**
      * No proposals waiting
      **/
-    NoneWaiting: GenericPalletError<Rv>;
+    NoneWaiting: GenericPalletError;
 
     /**
      * The given account did not vote on the referendum.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed, either through `unvote` or `reap_vote`.
      **/
-    VotesExist: GenericPalletError<Rv>;
+    VotesExist: GenericPalletError;
 
     /**
      * The instant referendum origin is currently disallowed.
      **/
-    InstantNotAllowed: GenericPalletError<Rv>;
+    InstantNotAllowed: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Invalid upper bound.
      **/
-    WrongUpperBound: GenericPalletError<Rv>;
+    WrongUpperBound: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Maximum number of items reached.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Voting period too low
      **/
-    VotingPeriodLow: GenericPalletError<Rv>;
+    VotingPeriodLow: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -2202,33 +2202,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CommunityTreasury`'s errors
@@ -2237,33 +2237,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SafeMode`'s errors
@@ -2272,42 +2272,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The safe-mode is (already or still) entered.
      **/
-    Entered: GenericPalletError<Rv>;
+    Entered: GenericPalletError;
 
     /**
      * The safe-mode is (already or still) exited.
      **/
-    Exited: GenericPalletError<Rv>;
+    Exited: GenericPalletError;
 
     /**
      * This functionality of the pallet is disabled by the configuration.
      **/
-    NotConfigured: GenericPalletError<Rv>;
+    NotConfigured: GenericPalletError;
 
     /**
      * There is no balance reserved.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The account already has a deposit reserved and can therefore not enter or extend again.
      **/
-    AlreadyDeposited: GenericPalletError<Rv>;
+    AlreadyDeposited: GenericPalletError;
 
     /**
      * This deposit cannot be released yet.
      **/
-    CannotReleaseYet: GenericPalletError<Rv>;
+    CannotReleaseYet: GenericPalletError;
 
     /**
      * An error from the underlying `Currency`.
      **/
-    CurrencyError: GenericPalletError<Rv>;
+    CurrencyError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TxPause`'s errors
@@ -2316,23 +2316,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The call is paused.
      **/
-    IsPaused: GenericPalletError<Rv>;
+    IsPaused: GenericPalletError;
 
     /**
      * The call is unpaused.
      **/
-    IsUnpaused: GenericPalletError<Rv>;
+    IsUnpaused: GenericPalletError;
 
     /**
      * The call is whitelisted and cannot be paused.
      **/
-    Unpausable: GenericPalletError<Rv>;
-    NotFound: GenericPalletError<Rv>;
+    Unpausable: GenericPalletError;
+    NotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -2341,11 +2341,11 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/astar/events.d.ts b/packages/chaintypes/src/astar/events.d.ts
index 605f02c6..6909255f 100644
--- a/packages/chaintypes/src/astar/events.d.ts
+++ b/packages/chaintypes/src/astar/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, Result, Bytes, FixedBytes, FixedU128, H160, U256 } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -35,7 +35,7 @@ import type {
   PalletSafeModeExitReason,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -43,18 +43,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -63,32 +57,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -98,37 +92,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -137,23 +131,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -163,7 +156,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -172,23 +164,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -198,7 +184,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -207,18 +192,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -229,7 +208,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -238,23 +216,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -263,19 +240,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -284,22 +260,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -309,7 +285,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -319,7 +294,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -329,7 +303,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -345,7 +318,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -354,7 +326,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -363,14 +335,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: AstarRuntimeProxyType; disambiguationIndex: number }
@@ -379,13 +350,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AstarRuntimeProxyType; delay: number }
@@ -395,7 +365,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AstarRuntimeProxyType; delay: number }
@@ -404,7 +373,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -413,18 +382,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -434,7 +402,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -444,7 +411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -454,7 +420,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -464,7 +429,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -475,7 +439,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -485,7 +448,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -494,7 +456,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -503,13 +465,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -518,18 +479,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -539,7 +499,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -548,7 +507,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -559,7 +518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -568,7 +526,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -577,40 +535,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -619,82 +576,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -704,17 +661,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Inflation`'s events
@@ -723,13 +680,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Inflation parameters have been force changed. This will have effect on the next inflation recalculation.
      **/
-    InflationParametersForceChanged: GenericPalletEvent<Rv, 'Inflation', 'InflationParametersForceChanged', null>;
+    InflationParametersForceChanged: GenericPalletEvent<'Inflation', 'InflationParametersForceChanged', null>;
 
     /**
      * Inflation recalculation has been forced.
      **/
     ForcedInflationRecalculation: GenericPalletEvent<
-      Rv,
       'Inflation',
       'ForcedInflationRecalculation',
       { config: PalletInflationInflationConfiguration }
@@ -739,7 +695,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New inflation configuration has been set.
      **/
     NewInflationConfiguration: GenericPalletEvent<
-      Rv,
       'Inflation',
       'NewInflationConfiguration',
       { config: PalletInflationInflationConfiguration }
@@ -748,7 +703,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DappStaking`'s events
@@ -757,18 +712,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Maintenance mode has been either enabled or disabled.
      **/
-    MaintenanceMode: GenericPalletEvent<Rv, 'DappStaking', 'MaintenanceMode', { enabled: boolean }>;
+    MaintenanceMode: GenericPalletEvent<'DappStaking', 'MaintenanceMode', { enabled: boolean }>;
 
     /**
      * New era has started.
      **/
-    NewEra: GenericPalletEvent<Rv, 'DappStaking', 'NewEra', { era: number }>;
+    NewEra: GenericPalletEvent<'DappStaking', 'NewEra', { era: number }>;
 
     /**
      * New subperiod has started.
      **/
     NewSubperiod: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'NewSubperiod',
       { subperiod: PalletDappStakingSubperiod; number: number }
@@ -778,7 +732,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A smart contract has been registered for dApp staking
      **/
     DAppRegistered: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'DAppRegistered',
       { owner: AccountId32; smartContract: AstarPrimitivesDappStakingSmartContract; dappId: number }
@@ -788,7 +741,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dApp reward destination has been updated.
      **/
     DAppRewardDestinationUpdated: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'DAppRewardDestinationUpdated',
       { smartContract: AstarPrimitivesDappStakingSmartContract; beneficiary?: AccountId32 | undefined }
@@ -798,7 +750,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dApp owner has been changed.
      **/
     DAppOwnerChanged: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'DAppOwnerChanged',
       { smartContract: AstarPrimitivesDappStakingSmartContract; newOwner: AccountId32 }
@@ -808,7 +759,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dApp has been unregistered
      **/
     DAppUnregistered: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'DAppUnregistered',
       { smartContract: AstarPrimitivesDappStakingSmartContract; era: number }
@@ -817,28 +767,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Account has locked some amount into dApp staking.
      **/
-    Locked: GenericPalletEvent<Rv, 'DappStaking', 'Locked', { account: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'DappStaking', 'Locked', { account: AccountId32; amount: bigint }>;
 
     /**
      * Account has started the unlocking process for some amount.
      **/
-    Unlocking: GenericPalletEvent<Rv, 'DappStaking', 'Unlocking', { account: AccountId32; amount: bigint }>;
+    Unlocking: GenericPalletEvent<'DappStaking', 'Unlocking', { account: AccountId32; amount: bigint }>;
 
     /**
      * Account has claimed unlocked amount, removing the lock from it.
      **/
-    ClaimedUnlocked: GenericPalletEvent<Rv, 'DappStaking', 'ClaimedUnlocked', { account: AccountId32; amount: bigint }>;
+    ClaimedUnlocked: GenericPalletEvent<'DappStaking', 'ClaimedUnlocked', { account: AccountId32; amount: bigint }>;
 
     /**
      * Account has relocked all of the unlocking chunks.
      **/
-    Relock: GenericPalletEvent<Rv, 'DappStaking', 'Relock', { account: AccountId32; amount: bigint }>;
+    Relock: GenericPalletEvent<'DappStaking', 'Relock', { account: AccountId32; amount: bigint }>;
 
     /**
      * Account has staked some amount on a smart contract.
      **/
     Stake: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'Stake',
       { account: AccountId32; smartContract: AstarPrimitivesDappStakingSmartContract; amount: bigint }
@@ -848,7 +797,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Account has unstaked some amount from a smart contract.
      **/
     Unstake: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'Unstake',
       { account: AccountId32; smartContract: AstarPrimitivesDappStakingSmartContract; amount: bigint }
@@ -857,13 +805,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Account has claimed some stake rewards.
      **/
-    Reward: GenericPalletEvent<Rv, 'DappStaking', 'Reward', { account: AccountId32; era: number; amount: bigint }>;
+    Reward: GenericPalletEvent<'DappStaking', 'Reward', { account: AccountId32; era: number; amount: bigint }>;
 
     /**
      * Bonus reward has been paid out to a staker with an eligible bonus status.
      **/
     BonusReward: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'BonusReward',
       { account: AccountId32; smartContract: AstarPrimitivesDappStakingSmartContract; period: number; amount: bigint }
@@ -873,7 +820,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dApp reward has been paid out to a beneficiary.
      **/
     DAppReward: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'DAppReward',
       {
@@ -890,7 +836,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Account has unstaked funds from an unregistered smart contract
      **/
     UnstakeFromUnregistered: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'UnstakeFromUnregistered',
       { account: AccountId32; smartContract: AstarPrimitivesDappStakingSmartContract; amount: bigint }
@@ -900,7 +845,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some expired stake entries have been removed from storage.
      **/
     ExpiredEntriesRemoved: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'ExpiredEntriesRemoved',
       { account: AccountId32; count: number }
@@ -909,13 +853,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Privileged origin has forced a new era and possibly a subperiod to start from next block.
      **/
-    Force: GenericPalletEvent<Rv, 'DappStaking', 'Force', { forcingType: PalletDappStakingForcingType }>;
+    Force: GenericPalletEvent<'DappStaking', 'Force', { forcingType: PalletDappStakingForcingType }>;
 
     /**
      * Account has moved some stake from a source smart contract to a destination smart contract.
      **/
     StakeMoved: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'StakeMoved',
       {
@@ -930,7 +873,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Tier parameters, used to calculate tier configuration, have been updated, and will be applicable from next era.
      **/
     NewTierParameters: GenericPalletEvent<
-      Rv,
       'DappStaking',
       'NewTierParameters',
       { params: PalletDappStakingTierParameters }
@@ -939,7 +881,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -948,18 +890,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: bigint; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: bigint; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: bigint; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: bigint; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: bigint; from: AccountId32; to: AccountId32; amount: bigint }
@@ -968,13 +909,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: bigint; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: bigint; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: bigint; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -983,33 +923,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: bigint; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: bigint; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: bigint; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: bigint; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: bigint; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: bigint; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: bigint }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: bigint }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: bigint }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: bigint }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: bigint; accountsDestroyed: number; accountsRemaining: number }
@@ -1019,7 +958,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: bigint; approvalsDestroyed: number; approvalsRemaining: number }
@@ -1028,23 +966,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: bigint }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: bigint }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: bigint }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: bigint }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: bigint; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: bigint; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: bigint; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -1053,13 +990,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: bigint }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: bigint }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: bigint; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -1069,7 +1005,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -1080,7 +1015,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: bigint; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -1089,13 +1023,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: bigint }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: bigint }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: bigint; newMinBalance: bigint }
@@ -1104,27 +1037,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: bigint; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: bigint; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: bigint; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: bigint; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: bigint; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: bigint; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: bigint; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: bigint; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PriceAggregator`'s events
@@ -1133,12 +1066,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New average native currency value has been calculated and pushed into the moving average buffer.
      **/
-    AverageAggregatedValue: GenericPalletEvent<Rv, 'PriceAggregator', 'AverageAggregatedValue', { value: FixedU128 }>;
+    AverageAggregatedValue: GenericPalletEvent<'PriceAggregator', 'AverageAggregatedValue', { value: FixedU128 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Oracle`'s events
@@ -1148,7 +1081,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New feed data is submitted.
      **/
     NewFeedData: GenericPalletEvent<
-      Rv,
       'Oracle',
       'NewFeedData',
       { sender: AccountId32; values: Array<[AstarPrimitivesOracleCurrencyId, FixedU128]> }
@@ -1157,7 +1089,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OracleMembership`'s events
@@ -1166,37 +1098,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The given member was added; see the transaction for who.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'OracleMembership', 'MemberAdded', undefined>;
+    MemberAdded: GenericPalletEvent<'OracleMembership', 'MemberAdded', undefined>;
 
     /**
      * The given member was removed; see the transaction for who.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'OracleMembership', 'MemberRemoved', undefined>;
+    MemberRemoved: GenericPalletEvent<'OracleMembership', 'MemberRemoved', undefined>;
 
     /**
      * Two members were swapped; see the transaction for who.
      **/
-    MembersSwapped: GenericPalletEvent<Rv, 'OracleMembership', 'MembersSwapped', undefined>;
+    MembersSwapped: GenericPalletEvent<'OracleMembership', 'MembersSwapped', undefined>;
 
     /**
      * The membership was reset; see the transaction for who the new set is.
      **/
-    MembersReset: GenericPalletEvent<Rv, 'OracleMembership', 'MembersReset', undefined>;
+    MembersReset: GenericPalletEvent<'OracleMembership', 'MembersReset', undefined>;
 
     /**
      * One of the members' keys changed.
      **/
-    KeyChanged: GenericPalletEvent<Rv, 'OracleMembership', 'KeyChanged', undefined>;
+    KeyChanged: GenericPalletEvent<'OracleMembership', 'KeyChanged', undefined>;
 
     /**
      * Phantom member, never used.
      **/
-    Dummy: GenericPalletEvent<Rv, 'OracleMembership', 'Dummy', undefined>;
+    Dummy: GenericPalletEvent<'OracleMembership', 'Dummy', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -1205,38 +1137,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New invulnerables candidates were set.
      **/
-    NewInvulnerables: GenericPalletEvent<Rv, 'CollatorSelection', 'NewInvulnerables', Array<AccountId32>>;
+    NewInvulnerables: GenericPalletEvent<'CollatorSelection', 'NewInvulnerables', Array<AccountId32>>;
 
     /**
      * The number of desired candidates was set.
      **/
-    NewDesiredCandidates: GenericPalletEvent<Rv, 'CollatorSelection', 'NewDesiredCandidates', number>;
+    NewDesiredCandidates: GenericPalletEvent<'CollatorSelection', 'NewDesiredCandidates', number>;
 
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', bigint>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', bigint>;
 
     /**
      * A new candidate joined.
      **/
-    CandidateAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateAdded', [AccountId32, bigint]>;
+    CandidateAdded: GenericPalletEvent<'CollatorSelection', 'CandidateAdded', [AccountId32, bigint]>;
 
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', AccountId32>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', AccountId32>;
 
     /**
      * A candidate was slashed.
      **/
-    CandidateSlashed: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateSlashed', AccountId32>;
+    CandidateSlashed: GenericPalletEvent<'CollatorSelection', 'CandidateSlashed', AccountId32>;
 
     /**
      * A new candidacy application was submitted.
      **/
     CandidacyApplicationSubmitted: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidacyApplicationSubmitted',
       [AccountId32, bigint]
@@ -1246,7 +1177,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidacy application was approved.
      **/
     CandidacyApplicationApproved: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidacyApplicationApproved',
       [AccountId32, bigint]
@@ -1255,17 +1185,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidacy application was closed.
      **/
-    CandidacyApplicationClosed: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidacyApplicationClosed', AccountId32>;
+    CandidacyApplicationClosed: GenericPalletEvent<'CollatorSelection', 'CandidacyApplicationClosed', AccountId32>;
 
     /**
      * A candidate was kicked.
      **/
-    CandidateKicked: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateKicked', AccountId32>;
+    CandidateKicked: GenericPalletEvent<'CollatorSelection', 'CandidateKicked', AccountId32>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -1275,12 +1205,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -1289,12 +1219,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -1303,13 +1233,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * A XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -1326,7 +1255,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1337,7 +1265,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -1348,7 +1275,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1360,7 +1286,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -1377,7 +1302,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1389,7 +1313,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1401,7 +1324,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -1417,7 +1339,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1426,13 +1347,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1444,7 +1364,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1455,7 +1374,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -1466,7 +1384,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -1477,7 +1394,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -1493,7 +1409,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1505,7 +1420,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -1521,7 +1435,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1531,7 +1444,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1542,7 +1454,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1552,7 +1463,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -1562,7 +1472,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1571,12 +1480,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -1586,29 +1495,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcAssetConfig`'s events
@@ -1618,7 +1522,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Registed mapping between asset type and asset Id.
      **/
     AssetRegistered: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'AssetRegistered',
       { assetLocation: XcmVersionedLocation; assetId: bigint }
@@ -1628,7 +1531,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Changed the amount of units we are charging per execution second for an asset
      **/
     UnitsPerSecondChanged: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'UnitsPerSecondChanged',
       { assetLocation: XcmVersionedLocation; unitsPerSecond: bigint }
@@ -1638,7 +1540,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Changed the asset type mapping for a given asset id
      **/
     AssetLocationChanged: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'AssetLocationChanged',
       { previousAssetLocation: XcmVersionedLocation; assetId: bigint; newAssetLocation: XcmVersionedLocation }
@@ -1648,7 +1549,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Supported asset type for fee payment removed.
      **/
     SupportedAssetRemoved: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'SupportedAssetRemoved',
       { assetLocation: XcmVersionedLocation }
@@ -1658,7 +1558,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Removed all information related to an asset Id
      **/
     AssetRemoved: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'AssetRemoved',
       { assetLocation: XcmVersionedLocation; assetId: bigint }
@@ -1668,7 +1567,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Notify when the migration step is updated.
      **/
     MigrationStepUpdated: GenericPalletEvent<
-      Rv,
       'XcAssetConfig',
       'MigrationStepUpdated',
       { newMigrationStep: PalletXcAssetConfigMigrationStep }
@@ -1677,7 +1575,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XTokens`'s events
@@ -1687,7 +1585,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transferred `Asset` with fee.
      **/
     TransferredAssets: GenericPalletEvent<
-      Rv,
       'XTokens',
       'TransferredAssets',
       { sender: AccountId32; assets: StagingXcmV5AssetAssets; fee: StagingXcmV5Asset; dest: StagingXcmV5Location }
@@ -1696,7 +1593,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -1706,7 +1603,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -1734,7 +1630,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1769,7 +1664,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1799,7 +1693,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1818,7 +1711,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVM`'s events
@@ -1827,32 +1720,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ethereum events from contracts.
      **/
-    Log: GenericPalletEvent<Rv, 'EVM', 'Log', { log: EthereumLog }>;
+    Log: GenericPalletEvent<'EVM', 'Log', { log: EthereumLog }>;
 
     /**
      * A contract has been created at given address.
      **/
-    Created: GenericPalletEvent<Rv, 'EVM', 'Created', { address: H160 }>;
+    Created: GenericPalletEvent<'EVM', 'Created', { address: H160 }>;
 
     /**
      * A contract was attempted to be created, but the execution failed.
      **/
-    CreatedFailed: GenericPalletEvent<Rv, 'EVM', 'CreatedFailed', { address: H160 }>;
+    CreatedFailed: GenericPalletEvent<'EVM', 'CreatedFailed', { address: H160 }>;
 
     /**
      * A contract has been executed successfully with states applied.
      **/
-    Executed: GenericPalletEvent<Rv, 'EVM', 'Executed', { address: H160 }>;
+    Executed: GenericPalletEvent<'EVM', 'Executed', { address: H160 }>;
 
     /**
      * A contract has been executed with errors. States are reverted with only gas fees applied.
      **/
-    ExecutedFailed: GenericPalletEvent<Rv, 'EVM', 'ExecutedFailed', { address: H160 }>;
+    ExecutedFailed: GenericPalletEvent<'EVM', 'ExecutedFailed', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Ethereum`'s events
@@ -1862,7 +1755,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An ethereum transaction was successfully executed.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Ethereum',
       'Executed',
       { from: H160; to: H160; transactionHash: H256; exitReason: EvmCoreErrorExitReason; extraData: Bytes }
@@ -1871,7 +1763,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s events
@@ -1880,12 +1772,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New `base fee per gas` value has been force-set.
      **/
-    NewBaseFeePerGas: GenericPalletEvent<Rv, 'DynamicEvmBaseFee', 'NewBaseFeePerGas', { fee: U256 }>;
+    NewBaseFeePerGas: GenericPalletEvent<'DynamicEvmBaseFee', 'NewBaseFeePerGas', { fee: U256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Contracts`'s events
@@ -1894,7 +1786,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by address at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
+    Instantiated: GenericPalletEvent<'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
 
     /**
      * Contract has been removed.
@@ -1905,7 +1797,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `seal_terminate`.
      **/
     Terminated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Terminated',
       {
@@ -1925,7 +1816,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Code with the specified hash has been stored.
      **/
     CodeStored: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeStored',
       { codeHash: H256; depositHeld: bigint; uploader: AccountId32 }
@@ -1935,7 +1825,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractEmitted',
       {
@@ -1956,7 +1845,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A code with the specified hash was removed.
      **/
     CodeRemoved: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeRemoved',
       { codeHash: H256; depositReleased: bigint; remover: AccountId32 }
@@ -1966,7 +1854,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A contract's code was updated.
      **/
     ContractCodeUpdated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractCodeUpdated',
       {
@@ -1997,7 +1884,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     Called: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Called',
       {
@@ -2023,7 +1909,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     DelegateCalled: GenericPalletEvent<
-      Rv,
       'Contracts',
       'DelegateCalled',
       {
@@ -2044,7 +1929,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some funds have been transferred and held as storage deposit.
      **/
     StorageDepositTransferredAndHeld: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndHeld',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -2054,7 +1938,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some storage deposit funds have been transferred and released.
      **/
     StorageDepositTransferredAndReleased: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndReleased',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -2063,7 +1946,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -2072,22 +1955,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -2097,7 +1980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -2112,7 +1994,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -2131,13 +2012,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -2151,7 +2031,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CouncilMembership`'s events
@@ -2160,37 +2040,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The given member was added; see the transaction for who.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'CouncilMembership', 'MemberAdded', undefined>;
+    MemberAdded: GenericPalletEvent<'CouncilMembership', 'MemberAdded', undefined>;
 
     /**
      * The given member was removed; see the transaction for who.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'CouncilMembership', 'MemberRemoved', undefined>;
+    MemberRemoved: GenericPalletEvent<'CouncilMembership', 'MemberRemoved', undefined>;
 
     /**
      * Two members were swapped; see the transaction for who.
      **/
-    MembersSwapped: GenericPalletEvent<Rv, 'CouncilMembership', 'MembersSwapped', undefined>;
+    MembersSwapped: GenericPalletEvent<'CouncilMembership', 'MembersSwapped', undefined>;
 
     /**
      * The membership was reset; see the transaction for who the new set is.
      **/
-    MembersReset: GenericPalletEvent<Rv, 'CouncilMembership', 'MembersReset', undefined>;
+    MembersReset: GenericPalletEvent<'CouncilMembership', 'MembersReset', undefined>;
 
     /**
      * One of the members' keys changed.
      **/
-    KeyChanged: GenericPalletEvent<Rv, 'CouncilMembership', 'KeyChanged', undefined>;
+    KeyChanged: GenericPalletEvent<'CouncilMembership', 'KeyChanged', undefined>;
 
     /**
      * Phantom member, never used.
      **/
-    Dummy: GenericPalletEvent<Rv, 'CouncilMembership', 'Dummy', undefined>;
+    Dummy: GenericPalletEvent<'CouncilMembership', 'Dummy', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommitteeMembership`'s events
@@ -2199,37 +2079,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The given member was added; see the transaction for who.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'MemberAdded', undefined>;
+    MemberAdded: GenericPalletEvent<'TechnicalCommitteeMembership', 'MemberAdded', undefined>;
 
     /**
      * The given member was removed; see the transaction for who.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'MemberRemoved', undefined>;
+    MemberRemoved: GenericPalletEvent<'TechnicalCommitteeMembership', 'MemberRemoved', undefined>;
 
     /**
      * Two members were swapped; see the transaction for who.
      **/
-    MembersSwapped: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'MembersSwapped', undefined>;
+    MembersSwapped: GenericPalletEvent<'TechnicalCommitteeMembership', 'MembersSwapped', undefined>;
 
     /**
      * The membership was reset; see the transaction for who the new set is.
      **/
-    MembersReset: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'MembersReset', undefined>;
+    MembersReset: GenericPalletEvent<'TechnicalCommitteeMembership', 'MembersReset', undefined>;
 
     /**
      * One of the members' keys changed.
      **/
-    KeyChanged: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'KeyChanged', undefined>;
+    KeyChanged: GenericPalletEvent<'TechnicalCommitteeMembership', 'KeyChanged', undefined>;
 
     /**
      * Phantom member, never used.
      **/
-    Dummy: GenericPalletEvent<Rv, 'TechnicalCommitteeMembership', 'Dummy', undefined>;
+    Dummy: GenericPalletEvent<'TechnicalCommitteeMembership', 'Dummy', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CommunityCouncilMembership`'s events
@@ -2238,37 +2118,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The given member was added; see the transaction for who.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'MemberAdded', undefined>;
+    MemberAdded: GenericPalletEvent<'CommunityCouncilMembership', 'MemberAdded', undefined>;
 
     /**
      * The given member was removed; see the transaction for who.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'MemberRemoved', undefined>;
+    MemberRemoved: GenericPalletEvent<'CommunityCouncilMembership', 'MemberRemoved', undefined>;
 
     /**
      * Two members were swapped; see the transaction for who.
      **/
-    MembersSwapped: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'MembersSwapped', undefined>;
+    MembersSwapped: GenericPalletEvent<'CommunityCouncilMembership', 'MembersSwapped', undefined>;
 
     /**
      * The membership was reset; see the transaction for who the new set is.
      **/
-    MembersReset: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'MembersReset', undefined>;
+    MembersReset: GenericPalletEvent<'CommunityCouncilMembership', 'MembersReset', undefined>;
 
     /**
      * One of the members' keys changed.
      **/
-    KeyChanged: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'KeyChanged', undefined>;
+    KeyChanged: GenericPalletEvent<'CommunityCouncilMembership', 'KeyChanged', undefined>;
 
     /**
      * Phantom member, never used.
      **/
-    Dummy: GenericPalletEvent<Rv, 'CommunityCouncilMembership', 'Dummy', undefined>;
+    Dummy: GenericPalletEvent<'CommunityCouncilMembership', 'Dummy', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Council`'s events
@@ -2279,7 +2159,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'Council',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -2290,7 +2169,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Council',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -2299,23 +2177,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'Council', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'Council', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'Council', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'Council', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
-    Executed: GenericPalletEvent<Rv, 'Council', 'Executed', { proposalHash: H256; result: Result<[], DispatchError> }>;
+    Executed: GenericPalletEvent<'Council', 'Executed', { proposalHash: H256; result: Result<[], DispatchError> }>;
 
     /**
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'Council',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -2324,28 +2201,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'Council', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'Council', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'Council', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'Council', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
-    ProposalCostBurned: GenericPalletEvent<
-      Rv,
-      'Council',
-      'ProposalCostBurned',
-      { proposalHash: H256; who: AccountId32 }
-    >;
+    ProposalCostBurned: GenericPalletEvent<'Council', 'ProposalCostBurned', { proposalHash: H256; who: AccountId32 }>;
 
     /**
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'Council',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -2354,7 +2225,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommittee`'s events
@@ -2365,7 +2236,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -2376,7 +2246,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -2385,18 +2254,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -2406,7 +2274,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -2415,18 +2282,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'TechnicalCommittee', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId32 }
@@ -2436,7 +2302,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -2445,7 +2310,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CommunityCouncil`'s events
@@ -2456,7 +2321,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -2467,7 +2331,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -2476,18 +2339,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'CommunityCouncil', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'CommunityCouncil', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'CommunityCouncil', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'CommunityCouncil', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -2497,7 +2359,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -2506,18 +2367,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'CommunityCouncil', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'CommunityCouncil', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'CommunityCouncil', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'CommunityCouncil', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId32 }
@@ -2527,7 +2387,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'CommunityCouncil',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -2536,7 +2395,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Democracy`'s events
@@ -2545,68 +2404,62 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion has been proposed by a public account.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
+    Proposed: GenericPalletEvent<'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * A public proposal has been tabled for referendum vote.
      **/
-    Tabled: GenericPalletEvent<Rv, 'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
+    Tabled: GenericPalletEvent<'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * An external proposal has been tabled.
      **/
-    ExternalTabled: GenericPalletEvent<Rv, 'Democracy', 'ExternalTabled', null>;
+    ExternalTabled: GenericPalletEvent<'Democracy', 'ExternalTabled', null>;
 
     /**
      * A referendum has begun.
      **/
-    Started: GenericPalletEvent<
-      Rv,
-      'Democracy',
-      'Started',
-      { refIndex: number; threshold: PalletDemocracyVoteThreshold }
-    >;
+    Started: GenericPalletEvent<'Democracy', 'Started', { refIndex: number; threshold: PalletDemocracyVoteThreshold }>;
 
     /**
      * A proposal has been approved by referendum.
      **/
-    Passed: GenericPalletEvent<Rv, 'Democracy', 'Passed', { refIndex: number }>;
+    Passed: GenericPalletEvent<'Democracy', 'Passed', { refIndex: number }>;
 
     /**
      * A proposal has been rejected by referendum.
      **/
-    NotPassed: GenericPalletEvent<Rv, 'Democracy', 'NotPassed', { refIndex: number }>;
+    NotPassed: GenericPalletEvent<'Democracy', 'NotPassed', { refIndex: number }>;
 
     /**
      * A referendum has been cancelled.
      **/
-    Cancelled: GenericPalletEvent<Rv, 'Democracy', 'Cancelled', { refIndex: number }>;
+    Cancelled: GenericPalletEvent<'Democracy', 'Cancelled', { refIndex: number }>;
 
     /**
      * An account has delegated their vote to another account.
      **/
-    Delegated: GenericPalletEvent<Rv, 'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
+    Delegated: GenericPalletEvent<'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
 
     /**
      * An account has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'Democracy', 'Undelegated', { account: AccountId32 }>;
+    Undelegated: GenericPalletEvent<'Democracy', 'Undelegated', { account: AccountId32 }>;
 
     /**
      * An external proposal has been vetoed.
      **/
-    Vetoed: GenericPalletEvent<Rv, 'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
+    Vetoed: GenericPalletEvent<'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
 
     /**
      * A proposal_hash has been blacklisted permanently.
      **/
-    Blacklisted: GenericPalletEvent<Rv, 'Democracy', 'Blacklisted', { proposalHash: H256 }>;
+    Blacklisted: GenericPalletEvent<'Democracy', 'Blacklisted', { proposalHash: H256 }>;
 
     /**
      * An account has voted in a referendum
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Democracy',
       'Voted',
       { voter: AccountId32; refIndex: number; vote: PalletDemocracyVoteAccountVote }
@@ -2615,18 +2468,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has seconded a proposal
      **/
-    Seconded: GenericPalletEvent<Rv, 'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
+    Seconded: GenericPalletEvent<'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
 
     /**
      * A proposal got canceled.
      **/
-    ProposalCanceled: GenericPalletEvent<Rv, 'Democracy', 'ProposalCanceled', { propIndex: number }>;
+    ProposalCanceled: GenericPalletEvent<'Democracy', 'ProposalCanceled', { propIndex: number }>;
 
     /**
      * Metadata for a proposal or a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataSet',
       {
@@ -2646,7 +2498,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a proposal or a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataCleared',
       {
@@ -2666,7 +2517,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata has been transferred to new owner.
      **/
     MetadataTransferred: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataTransferred',
       {
@@ -2690,7 +2540,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -2699,58 +2549,48 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New proposal.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Treasury', 'Proposed', { proposalIndex: number }>;
+    Proposed: GenericPalletEvent<'Treasury', 'Proposed', { proposalIndex: number }>;
 
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * A proposal was rejected; funds were slashed.
      **/
-    Rejected: GenericPalletEvent<Rv, 'Treasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
+    Rejected: GenericPalletEvent<'Treasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CommunityTreasury`'s events
@@ -2759,18 +2599,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New proposal.
      **/
-    Proposed: GenericPalletEvent<Rv, 'CommunityTreasury', 'Proposed', { proposalIndex: number }>;
+    Proposed: GenericPalletEvent<'CommunityTreasury', 'Proposed', { proposalIndex: number }>;
 
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'CommunityTreasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'CommunityTreasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'CommunityTreasury',
       'Awarded',
       { proposalIndex: number; award: bigint; account: AccountId32 }
@@ -2779,29 +2618,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was rejected; funds were slashed.
      **/
-    Rejected: GenericPalletEvent<Rv, 'CommunityTreasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
+    Rejected: GenericPalletEvent<'CommunityTreasury', 'Rejected', { proposalIndex: number; slashed: bigint }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'CommunityTreasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'CommunityTreasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'CommunityTreasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'CommunityTreasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'CommunityTreasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'CommunityTreasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      * The inactive funds of the pallet have been updated.
      **/
     UpdatedInactive: GenericPalletEvent<
-      Rv,
       'CommunityTreasury',
       'UpdatedInactive',
       { reactivated: bigint; deactivated: bigint }
@@ -2810,7 +2648,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollectiveProxy`'s events
@@ -2820,7 +2658,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Community proxy call executed successfully.
      **/
     CollectiveProxyExecuted: GenericPalletEvent<
-      Rv,
       'CollectiveProxy',
       'CollectiveProxyExecuted',
       { result: Result<[], DispatchError> }
@@ -2829,7 +2666,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SafeMode`'s events
@@ -2838,51 +2675,51 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The safe-mode was entered until inclusively this block.
      **/
-    Entered: GenericPalletEvent<Rv, 'SafeMode', 'Entered', { until: number }>;
+    Entered: GenericPalletEvent<'SafeMode', 'Entered', { until: number }>;
 
     /**
      * The safe-mode was extended until inclusively this block.
      **/
-    Extended: GenericPalletEvent<Rv, 'SafeMode', 'Extended', { until: number }>;
+    Extended: GenericPalletEvent<'SafeMode', 'Extended', { until: number }>;
 
     /**
      * Exited the safe-mode for a specific reason.
      **/
-    Exited: GenericPalletEvent<Rv, 'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
+    Exited: GenericPalletEvent<'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
 
     /**
      * An account reserved funds for either entering or extending the safe-mode.
      **/
-    DepositPlaced: GenericPalletEvent<Rv, 'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
+    DepositPlaced: GenericPalletEvent<'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had a reserve released that was reserved.
      **/
-    DepositReleased: GenericPalletEvent<Rv, 'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
+    DepositReleased: GenericPalletEvent<'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had reserve slashed that was reserved.
      **/
-    DepositSlashed: GenericPalletEvent<Rv, 'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
+    DepositSlashed: GenericPalletEvent<'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
 
     /**
      * Could not hold funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotDeposit: GenericPalletEvent<Rv, 'SafeMode', 'CannotDeposit', null>;
+    CannotDeposit: GenericPalletEvent<'SafeMode', 'CannotDeposit', null>;
 
     /**
      * Could not release funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotRelease: GenericPalletEvent<Rv, 'SafeMode', 'CannotRelease', null>;
+    CannotRelease: GenericPalletEvent<'SafeMode', 'CannotRelease', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TxPause`'s events
@@ -2891,17 +2728,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * This pallet, or a specific call is now paused.
      **/
-    CallPaused: GenericPalletEvent<Rv, 'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
+    CallPaused: GenericPalletEvent<'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * This pallet, or a specific call is now unpaused.
      **/
-    CallUnpaused: GenericPalletEvent<Rv, 'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
+    CallUnpaused: GenericPalletEvent<'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -2913,7 +2750,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -2932,20 +2768,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -2960,7 +2795,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -2980,7 +2814,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -3002,7 +2835,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -3022,7 +2854,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -3036,6 +2867,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/astar/index.d.ts b/packages/chaintypes/src/astar/index.d.ts
index 1190e6c1..48d49c26 100644
--- a/packages/chaintypes/src/astar/index.d.ts
+++ b/packages/chaintypes/src/astar/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AstarRuntimeRuntimeCall,
@@ -39,26 +39,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedAstarApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: AstarApi
  * @specVersion: 1900
  **/
-export interface AstarApi {
-  legacy: VersionedAstarApi<RpcLegacy>;
-  v2: VersionedAstarApi<RpcV2>;
+export interface AstarApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/astar/json-rpc.d.ts b/packages/chaintypes/src/astar/json-rpc.d.ts
index 9468ed4a..4d42ee17 100644
--- a/packages/chaintypes/src/astar/json-rpc.d.ts
+++ b/packages/chaintypes/src/astar/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_unstable_body'
   | 'archive_unstable_call'
@@ -140,4 +140,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'web3_clientVersion'
   | 'web3_sha3'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/astar/query.d.ts b/packages/chaintypes/src/astar/query.d.ts
index 35b410f3..c369a79a 100644
--- a/packages/chaintypes/src/astar/query.d.ts
+++ b/packages/chaintypes/src/astar/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -113,7 +113,7 @@ import type {
   PalletMigrationsMigrationCursor,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -124,35 +124,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -160,7 +160,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -168,28 +168,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -202,14 +202,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -226,21 +226,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -248,26 +248,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -282,7 +282,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -290,7 +290,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -299,7 +299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -311,7 +311,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -321,7 +321,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -329,7 +329,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -342,7 +342,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -356,7 +356,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -370,12 +369,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -386,7 +385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -396,12 +395,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -414,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -422,7 +420,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -435,11 +433,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -447,16 +441,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -466,7 +456,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -474,7 +464,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -482,11 +472,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -497,12 +483,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -518,7 +504,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -528,7 +514,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -542,7 +527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -553,7 +538,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -562,14 +547,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -578,7 +563,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -591,7 +576,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -602,7 +587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -614,7 +599,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -628,7 +613,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -642,7 +626,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -652,7 +636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -663,7 +647,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -674,7 +657,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -683,7 +666,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -692,7 +675,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -701,21 +684,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -723,7 +706,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -731,7 +714,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -739,7 +722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -748,12 +731,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -763,12 +746,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -778,18 +761,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -800,14 +783,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -838,7 +821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -849,7 +832,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -859,7 +842,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -867,7 +850,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -876,7 +859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -884,7 +866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -896,11 +878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -909,12 +887,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Inflation`'s storage queries
@@ -926,26 +904,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletInflationInflationConfiguration> =} callback
      **/
-    activeInflationConfig: GenericStorageQuery<Rv, () => PalletInflationInflationConfiguration>;
+    activeInflationConfig: GenericStorageQuery<() => PalletInflationInflationConfiguration>;
 
     /**
      * Static inflation parameters - used to calculate active inflation configuration at certain points in time.
      *
      * @param {Callback<PalletInflationInflationParameters> =} callback
      **/
-    inflationParams: GenericStorageQuery<Rv, () => PalletInflationInflationParameters>;
+    inflationParams: GenericStorageQuery<() => PalletInflationInflationParameters>;
 
     /**
      * Flag indicating whether on the first possible opportunity, recalculation of the inflation config should be done.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    doRecalculation: GenericStorageQuery<Rv, () => number | undefined>;
+    doRecalculation: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DappStaking`'s storage queries
@@ -956,14 +934,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletDappStakingProtocolState> =} callback
      **/
-    activeProtocolState: GenericStorageQuery<Rv, () => PalletDappStakingProtocolState>;
+    activeProtocolState: GenericStorageQuery<() => PalletDappStakingProtocolState>;
 
     /**
      * Counter for unique dApp identifiers.
      *
      * @param {Callback<number> =} callback
      **/
-    nextDAppId: GenericStorageQuery<Rv, () => number>;
+    nextDAppId: GenericStorageQuery<() => number>;
 
     /**
      * Map of all dApps integrated into dApp staking protocol.
@@ -975,7 +953,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDappStakingDAppInfo | undefined> =} callback
      **/
     integratedDApps: GenericStorageQuery<
-      Rv,
       (arg: AstarPrimitivesDappStakingSmartContract) => PalletDappStakingDAppInfo | undefined,
       AstarPrimitivesDappStakingSmartContract
     >;
@@ -985,7 +962,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForIntegratedDApps: GenericStorageQuery<Rv, () => number>;
+    counterForIntegratedDApps: GenericStorageQuery<() => number>;
 
     /**
      * General locked/staked information for each account.
@@ -993,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDappStakingAccountLedger> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDappStakingAccountLedger, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletDappStakingAccountLedger, AccountId32>;
 
     /**
      * Information about how much each staker has staked for each smart contract in some period.
@@ -1002,7 +979,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDappStakingSingularStakingInfo | undefined> =} callback
      **/
     stakerInfo: GenericStorageQuery<
-      Rv,
       (
         arg: [AccountId32Like, AstarPrimitivesDappStakingSmartContract],
       ) => PalletDappStakingSingularStakingInfo | undefined,
@@ -1015,14 +991,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingContractStakeAmount> =} callback
      **/
-    contractStake: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingContractStakeAmount, number>;
+    contractStake: GenericStorageQuery<(arg: number) => PalletDappStakingContractStakeAmount, number>;
 
     /**
      * General information about the current era.
      *
      * @param {Callback<PalletDappStakingEraInfo> =} callback
      **/
-    currentEraInfo: GenericStorageQuery<Rv, () => PalletDappStakingEraInfo>;
+    currentEraInfo: GenericStorageQuery<() => PalletDappStakingEraInfo>;
 
     /**
      * Information about rewards for each era.
@@ -1038,7 +1014,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingEraRewardSpan | undefined> =} callback
      **/
-    eraRewards: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingEraRewardSpan | undefined, number>;
+    eraRewards: GenericStorageQuery<(arg: number) => PalletDappStakingEraRewardSpan | undefined, number>;
 
     /**
      * Information about period's end.
@@ -1046,21 +1022,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingPeriodEndInfo | undefined> =} callback
      **/
-    periodEnd: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingPeriodEndInfo | undefined, number>;
+    periodEnd: GenericStorageQuery<(arg: number) => PalletDappStakingPeriodEndInfo | undefined, number>;
 
     /**
      * Static tier parameters used to calculate tier configuration.
      *
      * @param {Callback<PalletDappStakingTierParameters> =} callback
      **/
-    staticTierParams: GenericStorageQuery<Rv, () => PalletDappStakingTierParameters>;
+    staticTierParams: GenericStorageQuery<() => PalletDappStakingTierParameters>;
 
     /**
      * Tier configuration user for current & preceding eras.
      *
      * @param {Callback<PalletDappStakingTiersConfiguration> =} callback
      **/
-    tierConfig: GenericStorageQuery<Rv, () => PalletDappStakingTiersConfiguration>;
+    tierConfig: GenericStorageQuery<() => PalletDappStakingTiersConfiguration>;
 
     /**
      * Information about which tier a dApp belonged to in a specific era.
@@ -1068,14 +1044,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingDAppTierRewards | undefined> =} callback
      **/
-    dAppTiers: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingDAppTierRewards | undefined, number>;
+    dAppTiers: GenericStorageQuery<(arg: number) => PalletDappStakingDAppTierRewards | undefined, number>;
 
     /**
      * History cleanup marker - holds information about which DB entries should be cleaned up next, when applicable.
      *
      * @param {Callback<PalletDappStakingCleanupMarker> =} callback
      **/
-    historyCleanupMarker: GenericStorageQuery<Rv, () => PalletDappStakingCleanupMarker>;
+    historyCleanupMarker: GenericStorageQuery<() => PalletDappStakingCleanupMarker>;
 
     /**
      * Safeguard to prevent unwanted operations in production.
@@ -1084,12 +1060,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    safeguard: GenericStorageQuery<Rv, () => boolean>;
+    safeguard: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1101,7 +1077,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
+    asset: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1110,7 +1086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [bigint, AccountId32]
     >;
@@ -1124,7 +1099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [bigint, AccountId32, AccountId32]
     >;
@@ -1135,7 +1109,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetMetadata, bigint>;
+    metadata: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetMetadata, bigint>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1150,12 +1124,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => bigint | undefined>;
+    nextAssetId: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PriceAggregator`'s storage queries
@@ -1166,26 +1140,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FixedU128>> =} callback
      **/
-    currentBlockValues: GenericStorageQuery<Rv, () => Array<FixedU128>>;
+    currentBlockValues: GenericStorageQuery<() => Array<FixedU128>>;
 
     /**
      * Used to store the aggregated processed block values during some time period.
      *
      * @param {Callback<PalletPriceAggregatorValueAggregator> =} callback
      **/
-    intermediateValueAggregator: GenericStorageQuery<Rv, () => PalletPriceAggregatorValueAggregator>;
+    intermediateValueAggregator: GenericStorageQuery<() => PalletPriceAggregatorValueAggregator>;
 
     /**
      * Used to store aggregated intermediate values for some time period.
      *
      * @param {Callback<PalletPriceAggregatorCircularBuffer> =} callback
      **/
-    valuesCircularBuffer: GenericStorageQuery<Rv, () => PalletPriceAggregatorCircularBuffer>;
+    valuesCircularBuffer: GenericStorageQuery<() => PalletPriceAggregatorCircularBuffer>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Oracle`'s storage queries
@@ -1198,7 +1172,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
      **/
     rawValues: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AstarPrimitivesOracleCurrencyId]) => OrmlOracleModuleTimestampedValue | undefined,
       [AccountId32, AstarPrimitivesOracleCurrencyId]
     >;
@@ -1210,7 +1183,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
      **/
     values: GenericStorageQuery<
-      Rv,
       (arg: AstarPrimitivesOracleCurrencyId) => OrmlOracleModuleTimestampedValue | undefined,
       AstarPrimitivesOracleCurrencyId
     >;
@@ -1220,12 +1192,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<OrmlUtilitiesOrderedSet> =} callback
      **/
-    hasDispatched: GenericStorageQuery<Rv, () => OrmlUtilitiesOrderedSet>;
+    hasDispatched: GenericStorageQuery<() => OrmlUtilitiesOrderedSet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OracleMembership`'s storage queries
@@ -1236,19 +1208,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -1259,12 +1231,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -1275,14 +1247,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community approved, limited) collation candidates.
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidates: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Candidates who initiated leave intent or kicked.
@@ -1290,7 +1262,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, bigint] | undefined> =} callback
      **/
-    nonCandidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, bigint] | undefined, AccountId32>;
+    nonCandidates: GenericStorageQuery<(arg: AccountId32Like) => [number, bigint] | undefined, AccountId32>;
 
     /**
      * Last block authored by collator.
@@ -1298,7 +1270,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -1307,7 +1279,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -1316,14 +1288,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Destination account for slashed amount.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    slashDestination: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    slashDestination: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Pending applications to become a collator.
@@ -1331,12 +1303,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    pendingApplications: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    pendingApplications: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1347,14 +1319,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1362,7 +1334,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1370,7 +1342,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AstarRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1381,7 +1353,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -1389,7 +1361,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AstarRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1398,7 +1370,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1406,7 +1377,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1417,7 +1388,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1426,12 +1397,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1446,7 +1417,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -1455,12 +1426,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1478,7 +1449,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1490,7 +1461,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1499,7 +1470,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1511,7 +1481,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1521,14 +1490,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1537,7 +1506,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1545,7 +1513,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1556,7 +1524,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1564,7 +1532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1575,7 +1543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1583,7 +1551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1592,7 +1560,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1604,7 +1571,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1617,7 +1583,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1629,14 +1594,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1645,7 +1610,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1657,7 +1621,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1667,7 +1630,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1680,7 +1643,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1692,12 +1655,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcAssetConfig`'s storage queries
@@ -1711,7 +1674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<XcmVersionedLocation | undefined> =} callback
      **/
-    assetIdToLocation: GenericStorageQuery<Rv, (arg: bigint) => XcmVersionedLocation | undefined, bigint>;
+    assetIdToLocation: GenericStorageQuery<(arg: bigint) => XcmVersionedLocation | undefined, bigint>;
 
     /**
      * Mapping from an asset type to an asset id.
@@ -1721,7 +1684,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {XcmVersionedLocation} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    assetLocationToId: GenericStorageQuery<Rv, (arg: XcmVersionedLocation) => bigint | undefined, XcmVersionedLocation>;
+    assetLocationToId: GenericStorageQuery<(arg: XcmVersionedLocation) => bigint | undefined, XcmVersionedLocation>;
 
     /**
      * Stores the units per second for local execution for a AssetLocation.
@@ -1733,7 +1696,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     assetLocationUnitsPerSecond: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => bigint | undefined,
       XcmVersionedLocation
     >;
@@ -1742,12 +1704,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletXcAssetConfigMigrationStep> =} callback
      **/
-    assetHubMigrationStep: GenericStorageQuery<Rv, () => PalletXcAssetConfigMigrationStep>;
+    assetHubMigrationStep: GenericStorageQuery<() => PalletXcAssetConfigMigrationStep>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1760,7 +1722,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1770,7 +1731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1779,7 +1740,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1787,7 +1747,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -1798,26 +1758,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -1830,7 +1790,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined,
       number
     >;
@@ -1840,40 +1799,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s storage queries
@@ -1883,12 +1842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
+    baseFeePerGas: GenericStorageQuery<() => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1900,7 +1859,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1908,7 +1867,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1936,7 +1895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1947,7 +1906,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
     contractInfoOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
       AccountId32
     >;
@@ -1961,7 +1919,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1969,7 +1927,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1977,12 +1935,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1994,7 +1952,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -2002,19 +1960,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -2025,12 +1983,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CouncilMembership`'s storage queries
@@ -2041,19 +1999,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommitteeMembership`'s storage queries
@@ -2064,19 +2022,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityCouncilMembership`'s storage queries
@@ -2087,19 +2045,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Council`'s storage queries
@@ -2110,7 +2068,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -2118,7 +2076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2129,7 +2087,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2137,33 +2095,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -2174,7 +2132,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -2182,7 +2140,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2193,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2201,33 +2159,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityCouncil`'s storage queries
@@ -2238,7 +2196,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -2246,7 +2204,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2257,7 +2215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2265,33 +2223,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -2302,14 +2260,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -2319,14 +2277,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -2334,7 +2292,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -2344,7 +2302,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -2355,7 +2313,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -2363,7 +2321,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -2373,10 +2331,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -2385,7 +2340,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -2393,7 +2348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -2407,7 +2362,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -2415,7 +2369,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2426,7 +2380,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -2434,26 +2388,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityTreasury`'s storage queries
@@ -2464,7 +2418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -2472,26 +2426,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -2506,7 +2460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
+    enteredUntil: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -2517,12 +2471,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
+    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -2534,12 +2488,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -2552,7 +2506,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -2563,11 +2517,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/astar/runtime.d.ts b/packages/chaintypes/src/astar/runtime.d.ts
index e1003796..0c5e963c 100644
--- a/packages/chaintypes/src/astar/runtime.d.ts
+++ b/packages/chaintypes/src/astar/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -60,7 +60,7 @@ import type {
   XcmVersionedAsset,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -70,7 +70,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -78,7 +78,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -86,12 +86,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -102,7 +102,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -113,7 +113,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -122,12 +122,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
@@ -140,19 +140,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -174,12 +174,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -195,7 +195,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FpSelfContainedUncheckedExtrinsic} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: FpSelfContainedUncheckedExtrinsic,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -206,7 +205,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -215,7 +214,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<FpSelfContainedUncheckedExtrinsic>>
     >;
 
@@ -227,14 +225,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -257,7 +254,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: FpSelfContainedUncheckedExtrinsic,
@@ -270,7 +266,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -282,12 +278,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -299,12 +295,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -317,7 +313,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -328,7 +323,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -337,19 +331,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -363,7 +357,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: AstarRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -375,7 +368,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: AstarRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -385,7 +377,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -393,12 +385,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -416,7 +408,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -427,14 +419,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -449,12 +440,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EthereumRuntimeRPCApi - 0x582211f65bb14b89
@@ -465,7 +456,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_chain_id
      **/
-    chainId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    chainId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Returns pallet_evm::Accounts by address.
@@ -473,14 +464,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_basic
      * @param {H160} address
      **/
-    accountBasic: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<EvmBackendBasic>>;
+    accountBasic: GenericRuntimeApiMethod<(address: H160) => Promise<EvmBackendBasic>>;
 
     /**
      * Returns FixedGasPrice::min_gas_price
      *
      * @callname: EthereumRuntimeRPCApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * For a given account address, returns pallet_evm::AccountCodes.
@@ -488,14 +479,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_code_at
      * @param {H160} address
      **/
-    accountCodeAt: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    accountCodeAt: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Returns the converted FindAuthor::find_author authority id.
      *
      * @callname: EthereumRuntimeRPCApi_author
      **/
-    author: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    author: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * For a given account address and index, returns pallet_evm::AccountStorages.
@@ -504,7 +495,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} address
      * @param {U256} index
      **/
-    storageAt: GenericRuntimeApiMethod<Rv, (address: H160, index: U256) => Promise<H256>>;
+    storageAt: GenericRuntimeApiMethod<(address: H160, index: U256) => Promise<H256>>;
 
     /**
      *
@@ -521,7 +512,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -550,7 +540,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     create: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         data: BytesLike,
@@ -569,28 +558,27 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_current_block
      **/
-    currentBlock: GenericRuntimeApiMethod<Rv, () => Promise<EthereumBlock | undefined>>;
+    currentBlock: GenericRuntimeApiMethod<() => Promise<EthereumBlock | undefined>>;
 
     /**
      * Return the current receipt.
      *
      * @callname: EthereumRuntimeRPCApi_current_receipts
      **/
-    currentReceipts: GenericRuntimeApiMethod<Rv, () => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
+    currentReceipts: GenericRuntimeApiMethod<() => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
 
     /**
      * Return the current transaction status.
      *
      * @callname: EthereumRuntimeRPCApi_current_transaction_statuses
      **/
-    currentTransactionStatuses: GenericRuntimeApiMethod<Rv, () => Promise<Array<FpRpcTransactionStatus> | undefined>>;
+    currentTransactionStatuses: GenericRuntimeApiMethod<() => Promise<Array<FpRpcTransactionStatus> | undefined>>;
 
     /**
      *
      * @callname: EthereumRuntimeRPCApi_current_all
      **/
     currentAll: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<
         [
           EthereumBlock | undefined,
@@ -607,7 +595,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     extrinsicFilter: GenericRuntimeApiMethod<
-      Rv,
       (xts: Array<FpSelfContainedUncheckedExtrinsic>) => Promise<Array<EthereumTransactionTransactionV2>>
     >;
 
@@ -616,7 +603,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_elasticity
      **/
-    elasticity: GenericRuntimeApiMethod<Rv, () => Promise<Permill | undefined>>;
+    elasticity: GenericRuntimeApiMethod<() => Promise<Permill | undefined>>;
 
     /**
      * Used to determine if gas limit multiplier for non-transactional calls (eth_call/estimateGas)
@@ -624,7 +611,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_gas_limit_multiplier_support
      **/
-    gasLimitMultiplierSupport: GenericRuntimeApiMethod<Rv, () => Promise<[]>>;
+    gasLimitMultiplierSupport: GenericRuntimeApiMethod<() => Promise<[]>>;
 
     /**
      * Return the pending block.
@@ -633,7 +620,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     pendingBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         xts: Array<FpSelfContainedUncheckedExtrinsic>,
       ) => Promise<[EthereumBlock | undefined, Array<FpRpcTransactionStatus> | undefined]>
@@ -649,12 +635,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_initialize_pending_block
      * @param {Header} header
      **/
-    initializePendingBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    initializePendingBlock: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ConvertTransactionRuntimeApi - 0xe65b00e46cedd0aa
@@ -666,14 +652,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     convertTransaction: GenericRuntimeApiMethod<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => Promise<FpSelfContainedUncheckedExtrinsic>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ContractsApi - 0x68b66ba122c93fa7
@@ -693,7 +678,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: AccountId32Like,
@@ -719,7 +703,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -743,7 +726,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -764,7 +746,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: AccountId32Like,
         key: BytesLike,
@@ -774,7 +755,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DappStakingApi - 0xe8accb82fb152951
@@ -785,28 +766,28 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: DappStakingApi_periods_per_cycle
      **/
-    periodsPerCycle: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    periodsPerCycle: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * For how many standard era lengths does the voting subperiod last.
      *
      * @callname: DappStakingApi_eras_per_voting_subperiod
      **/
-    erasPerVotingSubperiod: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    erasPerVotingSubperiod: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * How many standard eras are there in the build&earn subperiod.
      *
      * @callname: DappStakingApi_eras_per_build_and_earn_subperiod
      **/
-    erasPerBuildAndEarnSubperiod: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    erasPerBuildAndEarnSubperiod: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * How many blocks are there per standard era.
      *
      * @callname: DappStakingApi_blocks_per_era
      **/
-    blocksPerEra: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    blocksPerEra: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Get dApp ranked tier assignment for the given dApp.
@@ -814,14 +795,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: DappStakingApi_get_dapp_tier_assignment
      **/
     getDappTierAssignment: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, AstarPrimitivesDappStakingRankedTier]>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -838,7 +818,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -853,7 +832,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -870,7 +848,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -889,7 +866,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -899,7 +875,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -914,7 +890,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AstarRuntimeOriginCaller,
         call: AstarRuntimeRuntimeCallLike,
@@ -930,7 +905,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -940,7 +914,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -958,7 +932,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -977,7 +950,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -987,7 +959,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1008,7 +980,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1029,7 +1001,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1039,11 +1011,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/astar/tx.d.ts b/packages/chaintypes/src/astar/tx.d.ts
index 47c42dda..0ddb6ba5 100644
--- a/packages/chaintypes/src/astar/tx.d.ts
+++ b/packages/chaintypes/src/astar/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -62,16 +60,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AstarRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AstarRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -84,16 +84,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -103,16 +102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -122,16 +120,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -144,16 +141,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -163,16 +159,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -182,16 +177,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -205,19 +199,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -227,16 +220,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -249,16 +241,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -275,16 +266,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -302,23 +292,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -347,16 +336,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AstarRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AstarRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AstarRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -379,19 +367,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -413,16 +400,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AstarRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AstarRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AstarRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -438,19 +424,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AstarRuntimeOriginCaller,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AstarRuntimeOriginCaller; call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -472,16 +457,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AstarRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AstarRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AstarRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -497,26 +481,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AstarRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AstarRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -534,16 +517,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -562,16 +544,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -589,16 +570,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -614,15 +594,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -648,19 +627,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -679,16 +657,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -705,19 +682,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -734,19 +710,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -763,19 +738,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -802,21 +776,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -837,16 +810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -863,19 +835,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -889,19 +860,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -917,16 +887,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -944,15 +913,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -968,20 +936,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -992,19 +959,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1029,14 +995,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -1048,7 +1012,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1059,16 +1024,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1080,16 +1044,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1099,16 +1062,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1120,16 +1082,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1140,16 +1101,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1160,23 +1120,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -1206,23 +1165,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -1246,19 +1204,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1310,7 +1267,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -1318,7 +1274,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AstarRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -1331,7 +1286,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1374,7 +1330,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -1382,7 +1337,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -1395,7 +1349,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1428,14 +1383,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -1447,14 +1400,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -1476,13 +1430,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AstarRuntimeProxyType | undefined,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -1493,7 +1445,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1513,20 +1466,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AstarRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AstarRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1544,20 +1496,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AstarRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AstarRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1571,15 +1522,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1608,20 +1558,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AstarRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AstarRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1650,7 +1599,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AstarRuntimeProxyType,
@@ -1658,7 +1606,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -1671,7 +1618,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1696,19 +1644,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1728,19 +1675,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1760,19 +1706,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1795,14 +1740,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AstarRuntimeProxyType | undefined,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -1814,14 +1757,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -1836,14 +1780,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -1855,7 +1797,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1866,19 +1809,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1892,7 +1834,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -1900,7 +1841,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -1913,7 +1853,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1923,16 +1864,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1945,14 +1885,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -1964,7 +1902,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1978,7 +1917,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -1986,7 +1924,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -1999,7 +1936,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AstarRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2022,20 +1960,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2058,20 +1995,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2081,16 +2017,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2100,23 +2035,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -2136,16 +2070,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPrimitivesParachainInherentParachainInherentData} data
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (data: CumulusPrimitivesParachainInherentParachainInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SetValidationData';
             params: { data: CumulusPrimitivesParachainInherentParachainInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2154,23 +2087,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -2179,7 +2111,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -2198,19 +2130,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2223,20 +2154,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2252,19 +2182,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2289,19 +2218,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2314,19 +2242,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2343,16 +2270,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2365,19 +2291,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2392,19 +2317,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2421,26 +2345,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -2459,15 +2382,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2487,16 +2409,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2519,19 +2440,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2556,20 +2476,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2600,19 +2519,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2628,26 +2546,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Inflation`'s transaction calls
@@ -2664,16 +2581,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletInflationInflationParameters} params
      **/
     forceSetInflationParams: GenericTxCall<
-      Rv,
       (params: PalletInflationInflationParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Inflation';
           palletCall: {
             name: 'ForceSetInflationParams';
             params: { params: PalletInflationInflationParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2688,16 +2604,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} nextEra
      **/
     forceInflationRecalculation: GenericTxCall<
-      Rv,
       (nextEra: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Inflation';
           palletCall: {
             name: 'ForceInflationRecalculation';
             params: { nextEra: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2718,22 +2633,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceReadjustConfig: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Inflation';
           palletCall: {
             name: 'ForceReadjustConfig';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DappStaking`'s transaction calls
@@ -2748,19 +2662,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbondAndUnstake: GenericTxCall<
-      Rv,
       (
         contractId: AstarPrimitivesDappStakingSmartContract,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'UnbondAndUnstake';
             params: { contractId: AstarPrimitivesDappStakingSmartContract; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2772,15 +2685,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'WithdrawUnbonded';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2791,16 +2703,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} enabled
      **/
     maintenanceMode: GenericTxCall<
-      Rv,
       (enabled: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'MaintenanceMode';
             params: { enabled: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2814,19 +2725,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarPrimitivesDappStakingSmartContract} smartContract
      **/
     register: GenericTxCall<
-      Rv,
       (
         owner: AccountId32Like,
         smartContract: AstarPrimitivesDappStakingSmartContract,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Register';
             params: { owner: AccountId32Like; smartContract: AstarPrimitivesDappStakingSmartContract };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2841,12 +2751,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} beneficiary
      **/
     setDappRewardBeneficiary: GenericTxCall<
-      Rv,
       (
         smartContract: AstarPrimitivesDappStakingSmartContract,
         beneficiary: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
@@ -2856,7 +2764,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               beneficiary: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2872,19 +2781,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newOwner
      **/
     setDappOwner: GenericTxCall<
-      Rv,
       (
         smartContract: AstarPrimitivesDappStakingSmartContract,
         newOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'SetDappOwner';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract; newOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2897,16 +2805,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarPrimitivesDappStakingSmartContract} smartContract
      **/
     unregister: GenericTxCall<
-      Rv,
       (smartContract: AstarPrimitivesDappStakingSmartContract) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Unregister';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2921,16 +2828,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     lock: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Lock';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2944,16 +2850,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     unlock: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Unlock';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2962,15 +2867,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimUnlocked: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimUnlocked';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2978,15 +2882,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     relockUnlocking: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'RelockUnlocking';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3004,19 +2907,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     stake: GenericTxCall<
-      Rv,
       (
         smartContract: AstarPrimitivesDappStakingSmartContract,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Stake';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3035,19 +2937,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     unstake: GenericTxCall<
-      Rv,
       (
         smartContract: AstarPrimitivesDappStakingSmartContract,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Unstake';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3057,15 +2958,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimStakerRewards: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimStakerRewards';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3075,16 +2975,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarPrimitivesDappStakingSmartContract} smartContract
      **/
     claimBonusReward: GenericTxCall<
-      Rv,
       (smartContract: AstarPrimitivesDappStakingSmartContract) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimBonusReward';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3095,19 +2994,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     claimDappReward: GenericTxCall<
-      Rv,
       (
         smartContract: AstarPrimitivesDappStakingSmartContract,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimDappReward';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3118,16 +3016,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarPrimitivesDappStakingSmartContract} smartContract
      **/
     unstakeFromUnregistered: GenericTxCall<
-      Rv,
       (smartContract: AstarPrimitivesDappStakingSmartContract) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'UnstakeFromUnregistered';
             params: { smartContract: AstarPrimitivesDappStakingSmartContract };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3140,15 +3037,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cleanupExpiredEntries: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'CleanupExpiredEntries';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3164,16 +3060,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDappStakingForcingType} forcingType
      **/
     force: GenericTxCall<
-      Rv,
       (forcingType: PalletDappStakingForcingType) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'Force';
             params: { forcingType: PalletDappStakingForcingType };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3184,16 +3079,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     claimStakerRewardsFor: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimStakerRewardsFor';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3204,19 +3098,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarPrimitivesDappStakingSmartContract} smartContract
      **/
     claimBonusRewardFor: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         smartContract: AstarPrimitivesDappStakingSmartContract,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'ClaimBonusRewardFor';
             params: { account: AccountId32Like; smartContract: AstarPrimitivesDappStakingSmartContract };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3229,13 +3122,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     moveStake: GenericTxCall<
-      Rv,
       (
         sourceContract: AstarPrimitivesDappStakingSmartContract,
         destinationContract: AstarPrimitivesDappStakingSmartContract,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
@@ -3246,7 +3137,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3260,23 +3152,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDappStakingTierParameters} params
      **/
     setStaticTierParams: GenericTxCall<
-      Rv,
       (params: PalletDappStakingTierParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DappStaking';
           palletCall: {
             name: 'SetStaticTierParams';
             params: { params: PalletDappStakingTierParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -3308,20 +3199,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: bigint,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: bigint; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3352,21 +3242,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: bigint; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3384,16 +3273,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3414,16 +3302,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3444,16 +3331,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3472,16 +3358,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3504,20 +3389,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: bigint,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: bigint; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3543,20 +3427,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: bigint; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3585,20 +3468,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: bigint; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3627,20 +3509,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: bigint,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: bigint; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3671,21 +3552,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: bigint; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3707,19 +3587,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: bigint; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3739,19 +3618,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: bigint; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3769,16 +3647,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3796,16 +3673,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3825,19 +3701,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: bigint; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3861,21 +3736,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: bigint,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: bigint; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3903,21 +3777,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: bigint,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: bigint; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3937,16 +3810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3973,7 +3845,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: bigint,
         name: BytesLike,
@@ -3981,14 +3852,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: bigint; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4008,16 +3879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4055,7 +3925,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: MultiAddressLike,
@@ -4066,7 +3935,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -4082,7 +3950,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4113,20 +3982,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: bigint; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4149,19 +4017,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: bigint,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: bigint; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4185,20 +4052,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: bigint; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4228,21 +4094,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: bigint; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4260,16 +4125,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4289,19 +4153,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: bigint,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: bigint; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4323,19 +4186,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: bigint,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: bigint; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4355,19 +4217,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: bigint; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4387,19 +4248,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: bigint; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4419,19 +4279,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: bigint; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4458,27 +4317,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: bigint,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: bigint; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Oracle`'s transaction calls
@@ -4492,23 +4350,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AstarPrimitivesOracleCurrencyId, FixedU128]>} values
      **/
     feedValues: GenericTxCall<
-      Rv,
       (values: Array<[AstarPrimitivesOracleCurrencyId, FixedU128]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Oracle';
           palletCall: {
             name: 'FeedValues';
             params: { values: Array<[AstarPrimitivesOracleCurrencyId, FixedU128]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OracleMembership`'s transaction calls
@@ -4522,16 +4379,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4543,16 +4399,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     removeMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4567,19 +4422,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} add
      **/
     swapMember: GenericTxCall<
-      Rv,
       (
         remove: MultiAddressLike,
         add: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'SwapMember';
             params: { remove: MultiAddressLike; add: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4592,16 +4446,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} members
      **/
     resetMembers: GenericTxCall<
-      Rv,
       (members: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'ResetMembers';
             params: { members: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4615,16 +4468,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     changeKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'ChangeKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4636,16 +4488,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     setPrime: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'SetPrime';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4656,22 +4507,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPrime: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OracleMembership';
           palletCall: {
             name: 'ClearPrime';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -4683,16 +4533,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4704,16 +4553,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4723,16 +4571,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4748,15 +4595,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4770,15 +4616,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4788,15 +4633,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     withdrawBond: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'WithdrawBond';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4807,16 +4651,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} destination
      **/
     setSlashDestination: GenericTxCall<
-      Rv,
       (destination: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetSlashDestination';
             params: { destination: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4826,16 +4669,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4845,16 +4687,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4866,15 +4707,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     applyForCandidacy: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'ApplyForCandidacy';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4887,16 +4727,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     closeApplication: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'CloseApplication';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4909,16 +4748,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     approveApplication: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'ApproveApplication';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4934,23 +4772,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     kickCandidate: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'KickCandidate';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -4971,19 +4808,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: AstarRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: AstarRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5003,22 +4839,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -5031,15 +4866,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5052,15 +4886,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5074,16 +4907,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5097,16 +4929,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5120,23 +4951,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -5148,19 +4978,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5190,14 +5019,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5209,7 +5036,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5251,14 +5079,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5270,7 +5096,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5288,19 +5115,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5316,19 +5142,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5342,16 +5167,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5364,16 +5188,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5388,16 +5211,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5440,7 +5262,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5448,7 +5269,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5461,7 +5281,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5492,7 +5313,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5500,7 +5320,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5513,7 +5332,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5526,16 +5346,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5581,7 +5400,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5589,7 +5407,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5602,7 +5419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5618,19 +5436,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5693,7 +5510,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -5703,7 +5519,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5718,14 +5533,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -5734,7 +5550,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcAssetConfig`'s transaction calls
@@ -5749,19 +5565,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} assetId
      **/
     registerAssetLocation: GenericTxCall<
-      Rv,
       (
         assetLocation: XcmVersionedLocation,
         assetId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'RegisterAssetLocation';
             params: { assetLocation: XcmVersionedLocation; assetId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5773,19 +5588,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unitsPerSecond
      **/
     setAssetUnitsPerSecond: GenericTxCall<
-      Rv,
       (
         assetLocation: XcmVersionedLocation,
         unitsPerSecond: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'SetAssetUnitsPerSecond';
             params: { assetLocation: XcmVersionedLocation; unitsPerSecond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5797,19 +5611,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} assetId
      **/
     changeExistingAssetLocation: GenericTxCall<
-      Rv,
       (
         newAssetLocation: XcmVersionedLocation,
         assetId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'ChangeExistingAssetLocation';
             params: { newAssetLocation: XcmVersionedLocation; assetId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5821,16 +5634,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} assetLocation
      **/
     removePaymentAsset: GenericTxCall<
-      Rv,
       (assetLocation: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'RemovePaymentAsset';
             params: { assetLocation: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5840,16 +5652,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} assetId
      **/
     removeAsset: GenericTxCall<
-      Rv,
       (assetId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'RemoveAsset';
             params: { assetId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5858,23 +5669,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXcAssetConfigMigrationStep} migrationStep
      **/
     updateMigrationStep: GenericTxCall<
-      Rv,
       (migrationStep: PalletXcAssetConfigMigrationStep) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcAssetConfig';
           palletCall: {
             name: 'UpdateMigrationStep';
             params: { migrationStep: PalletXcAssetConfigMigrationStep };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XTokens`'s transaction calls
@@ -5900,14 +5710,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         currencyId: bigint,
         amount: bigint,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -5919,7 +5727,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5942,20 +5751,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiasset: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
             name: 'TransferMultiasset';
             params: { asset: XcmVersionedAsset; dest: XcmVersionedLocation; destWeightLimit: XcmV3WeightLimit };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5989,7 +5797,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferWithFee: GenericTxCall<
-      Rv,
       (
         currencyId: bigint,
         amount: bigint,
@@ -5997,7 +5804,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -6010,7 +5816,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6043,14 +5850,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassetWithFee: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         fee: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -6062,7 +5867,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6089,14 +5895,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMulticurrencies: GenericTxCall<
-      Rv,
       (
         currencies: Array<[bigint, bigint]>,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -6108,7 +5912,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6135,14 +5940,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -6154,14 +5957,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -6174,19 +5978,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6211,14 +6014,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -6230,14 +6031,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVM`'s transaction calls
@@ -6250,19 +6052,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         address: H160,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
             name: 'Withdraw';
             params: { address: H160; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6280,7 +6081,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     call: GenericTxCall<
-      Rv,
       (
         source: H160,
         target: H160,
@@ -6292,7 +6092,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -6309,7 +6108,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6327,7 +6127,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -6338,7 +6137,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -6354,7 +6152,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6372,7 +6171,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create2: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -6384,7 +6182,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -6401,14 +6198,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Ethereum`'s transaction calls
@@ -6420,23 +6218,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     transact: GenericTxCall<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ethereum';
           palletCall: {
             name: 'Transact';
             params: { transaction: EthereumTransactionTransactionV2 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s transaction calls
@@ -6449,23 +6246,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {U256} fee
      **/
     setBaseFeePerGas: GenericTxCall<
-      Rv,
       (fee: U256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DynamicEvmBaseFee';
           palletCall: {
             name: 'SetBaseFeePerGas';
             params: { fee: U256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Contracts`'s transaction calls
@@ -6481,7 +6277,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     callOldWeight: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -6489,7 +6284,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6502,7 +6296,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6517,7 +6312,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCodeOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -6526,7 +6320,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6540,7 +6333,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6555,7 +6349,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -6564,7 +6357,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6578,7 +6370,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6613,13 +6406,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint | undefined,
         determinism: PalletContractsWasmDeterminism,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6630,7 +6421,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               determinism: PalletContractsWasmDeterminism;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6643,16 +6435,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6672,19 +6463,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'SetCode';
             params: { dest: MultiAddressLike; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6713,7 +6503,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -6721,7 +6510,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6734,7 +6522,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6773,7 +6562,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -6782,7 +6570,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6796,7 +6583,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6815,7 +6603,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -6824,7 +6611,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -6838,7 +6624,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6851,23 +6638,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     migrate: GenericTxCall<
-      Rv,
       (weightLimit: SpWeightsWeightV2Weight) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'Migrate';
             params: { weightLimit: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -6882,16 +6668,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6906,16 +6691,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6928,16 +6712,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6949,16 +6732,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6970,23 +6752,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -6998,16 +6779,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: AstarRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7022,19 +6802,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: AstarRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: AstarRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7045,16 +6824,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7068,19 +6846,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: AstarRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7091,22 +6868,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CouncilMembership`'s transaction calls
@@ -7120,16 +6896,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7141,16 +6916,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     removeMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7165,19 +6939,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} add
      **/
     swapMember: GenericTxCall<
-      Rv,
       (
         remove: MultiAddressLike,
         add: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'SwapMember';
             params: { remove: MultiAddressLike; add: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7190,16 +6963,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} members
      **/
     resetMembers: GenericTxCall<
-      Rv,
       (members: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'ResetMembers';
             params: { members: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7213,16 +6985,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     changeKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'ChangeKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7234,16 +7005,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     setPrime: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'SetPrime';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7254,22 +7024,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPrime: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CouncilMembership';
           palletCall: {
             name: 'ClearPrime';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommitteeMembership`'s transaction calls
@@ -7283,16 +7052,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7304,16 +7072,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     removeMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7328,19 +7095,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} add
      **/
     swapMember: GenericTxCall<
-      Rv,
       (
         remove: MultiAddressLike,
         add: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'SwapMember';
             params: { remove: MultiAddressLike; add: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7353,16 +7119,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} members
      **/
     resetMembers: GenericTxCall<
-      Rv,
       (members: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'ResetMembers';
             params: { members: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7376,16 +7141,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     changeKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'ChangeKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7397,16 +7161,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     setPrime: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'SetPrime';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7417,22 +7180,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPrime: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommitteeMembership';
           palletCall: {
             name: 'ClearPrime';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CommunityCouncilMembership`'s transaction calls
@@ -7446,16 +7208,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7467,16 +7228,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     removeMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7491,19 +7251,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} add
      **/
     swapMember: GenericTxCall<
-      Rv,
       (
         remove: MultiAddressLike,
         add: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'SwapMember';
             params: { remove: MultiAddressLike; add: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7516,16 +7275,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} members
      **/
     resetMembers: GenericTxCall<
-      Rv,
       (members: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'ResetMembers';
             params: { members: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7539,16 +7297,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     changeKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'ChangeKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7560,16 +7317,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     setPrime: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'SetPrime';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7580,22 +7336,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPrime: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncilMembership';
           palletCall: {
             name: 'ClearPrime';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Council`'s transaction calls
@@ -7632,20 +7387,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7664,19 +7418,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Execute';
             params: { proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7701,20 +7454,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7734,20 +7486,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7766,16 +7517,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7811,14 +7561,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
@@ -7830,7 +7578,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7846,16 +7595,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7873,23 +7621,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommittee`'s transaction calls
@@ -7926,20 +7673,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7958,19 +7704,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Execute';
             params: { proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7995,20 +7740,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8028,20 +7772,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8060,16 +7803,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8105,14 +7847,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
@@ -8124,7 +7864,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8140,16 +7881,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8167,23 +7907,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CommunityCouncil`'s transaction calls
@@ -8220,20 +7959,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8252,19 +7990,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'Execute';
             params: { proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8289,20 +8026,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: AstarRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: AstarRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8322,20 +8058,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8354,16 +8089,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8399,14 +8133,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
@@ -8418,7 +8150,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8434,16 +8167,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8461,23 +8193,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityCouncil';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Democracy`'s transaction calls
@@ -8498,19 +8229,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     propose: GenericTxCall<
-      Rv,
       (
         proposal: FrameSupportPreimagesBounded,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Propose';
             params: { proposal: FrameSupportPreimagesBounded; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8525,16 +8255,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposal
      **/
     second: GenericTxCall<
-      Rv,
       (proposal: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Second';
             params: { proposal: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8551,19 +8280,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDemocracyVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         refIndex: number,
         vote: PalletDemocracyVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Vote';
             params: { refIndex: number; vote: PalletDemocracyVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8580,16 +8308,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     emergencyCancel: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'EmergencyCancel';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8604,16 +8331,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalPropose: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalPropose';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8633,16 +8359,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeMajority: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeMajority';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8662,16 +8387,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeDefault: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeDefault';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8698,20 +8422,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     fastTrack: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         votingPeriod: number,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'FastTrack';
             params: { proposalHash: H256; votingPeriod: number; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8729,16 +8452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     vetoExternal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'VetoExternal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8754,16 +8476,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     cancelReferendum: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelReferendum';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8794,20 +8515,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         to: MultiAddressLike,
         conviction: PalletDemocracyConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Delegate';
             params: { to: MultiAddressLike; conviction: PalletDemocracyConviction; balance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8827,15 +8547,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     undelegate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Undelegate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8848,15 +8567,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPublicProposals: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ClearPublicProposals';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8872,16 +8590,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Unlock';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8917,16 +8634,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveVote';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8951,19 +8667,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8988,19 +8703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeRefIndex
      **/
     blacklist: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         maybeRefIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Blacklist';
             params: { proposalHash: H256; maybeRefIndex: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9016,16 +8730,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} propIndex
      **/
     cancelProposal: GenericTxCall<
-      Rv,
       (propIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelProposal';
             params: { propIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9050,26 +8763,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         owner: PalletDemocracyMetadataOwner,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'SetMetadata';
             params: { owner: PalletDemocracyMetadataOwner; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -9097,19 +8809,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     proposeSpend: GenericTxCall<
-      Rv,
       (
         value: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'ProposeSpend';
             params: { value: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9133,16 +8844,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     rejectProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RejectProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9168,23 +8878,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     approveProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'ApproveProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CommunityTreasury`'s transaction calls
@@ -9212,19 +8921,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     proposeSpend: GenericTxCall<
-      Rv,
       (
         value: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityTreasury';
           palletCall: {
             name: 'ProposeSpend';
             params: { value: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9248,16 +8956,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     rejectProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityTreasury';
           palletCall: {
             name: 'RejectProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9283,23 +8990,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     approveProposal: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CommunityTreasury';
           palletCall: {
             name: 'ApproveProposal';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollectiveProxy`'s transaction calls
@@ -9314,23 +9020,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AstarRuntimeRuntimeCallLike} call
      **/
     executeCall: GenericTxCall<
-      Rv,
       (call: AstarRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollectiveProxy';
           palletCall: {
             name: 'ExecuteCall';
             params: { call: AstarRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SafeMode`'s transaction calls
@@ -9346,15 +9051,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     enter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Enter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9368,15 +9072,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceEnter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceEnter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9395,15 +9098,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     extend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Extend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9417,15 +9119,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExtend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExtend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9442,15 +9143,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9469,19 +9169,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceSlashDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceSlashDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9503,19 +9202,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     releaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9536,26 +9234,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceReleaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TxPause`'s transaction calls
@@ -9570,16 +9267,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} fullName
      **/
     pause: GenericTxCall<
-      Rv,
       (fullName: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Pause';
             params: { fullName: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9592,23 +9288,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} ident
      **/
     unpause: GenericTxCall<
-      Rv,
       (ident: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Unpause';
             params: { ident: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -9624,16 +9319,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9650,20 +9344,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9675,15 +9368,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9697,22 +9389,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/astar/view-functions.d.ts b/packages/chaintypes/src/astar/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/astar/view-functions.d.ts
+++ b/packages/chaintypes/src/astar/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/basilisk/consts.d.ts b/packages/chaintypes/src/basilisk/consts.d.ts
index 502bfd6b..52e09436 100644
--- a/packages/chaintypes/src/basilisk/consts.d.ts
+++ b/packages/chaintypes/src/basilisk/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, FixedBytes, AccountId32 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -14,7 +14,7 @@ import type {
   StagingXcmV4Location,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/basilisk/errors.d.ts b/packages/chaintypes/src/basilisk/errors.d.ts
index dca91946..eff41381 100644
--- a/packages/chaintypes/src/basilisk/errors.d.ts
+++ b/packages/chaintypes/src/basilisk/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -68,67 +68,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiTransactionPayment`'s errors
@@ -137,67 +137,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Selected currency is not supported.
      **/
-    UnsupportedCurrency: GenericPalletError<Rv>;
+    UnsupportedCurrency: GenericPalletError;
 
     /**
      * Account balance should be non-zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Currency is already in the list of accepted currencies.
      **/
-    AlreadyAccepted: GenericPalletError<Rv>;
+    AlreadyAccepted: GenericPalletError;
 
     /**
      * It is not allowed to add Core Asset as accepted currency. Core asset is accepted by design.
      **/
-    CoreAssetNotAllowed: GenericPalletError<Rv>;
+    CoreAssetNotAllowed: GenericPalletError;
 
     /**
      * Fallback price cannot be zero.
      **/
-    ZeroPrice: GenericPalletError<Rv>;
+    ZeroPrice: GenericPalletError;
 
     /**
      * Fallback price was not found.
      **/
-    FallbackPriceNotFound: GenericPalletError<Rv>;
+    FallbackPriceNotFound: GenericPalletError;
 
     /**
      * Math overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * It is not allowed to change payment currency of an EVM account.
      **/
-    EvmAccountNotAllowed: GenericPalletError<Rv>;
+    EvmAccountNotAllowed: GenericPalletError;
 
     /**
      * EVM permit expired.
      **/
-    EvmPermitExpired: GenericPalletError<Rv>;
+    EvmPermitExpired: GenericPalletError;
 
     /**
      * EVM permit is invalid.
      **/
-    EvmPermitInvalid: GenericPalletError<Rv>;
+    EvmPermitInvalid: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitCallExecutionError: GenericPalletError<Rv>;
+    EvmPermitCallExecutionError: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitRunnerError: GenericPalletError<Rv>;
+    EvmPermitRunnerError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -206,63 +206,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -271,12 +271,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Democracy`'s errors
@@ -285,128 +285,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Value too low
      **/
-    ValueLow: GenericPalletError<Rv>;
+    ValueLow: GenericPalletError;
 
     /**
      * Proposal does not exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Cannot cancel the same proposal twice
      **/
-    AlreadyCanceled: GenericPalletError<Rv>;
+    AlreadyCanceled: GenericPalletError;
 
     /**
      * Proposal already made
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal still blacklisted
      **/
-    ProposalBlacklisted: GenericPalletError<Rv>;
+    ProposalBlacklisted: GenericPalletError;
 
     /**
      * Next external proposal not simple majority
      **/
-    NotSimpleMajority: GenericPalletError<Rv>;
+    NotSimpleMajority: GenericPalletError;
 
     /**
      * Invalid hash
      **/
-    InvalidHash: GenericPalletError<Rv>;
+    InvalidHash: GenericPalletError;
 
     /**
      * No external proposal
      **/
-    NoProposal: GenericPalletError<Rv>;
+    NoProposal: GenericPalletError;
 
     /**
      * Identity may not veto a proposal twice
      **/
-    AlreadyVetoed: GenericPalletError<Rv>;
+    AlreadyVetoed: GenericPalletError;
 
     /**
      * Vote given for invalid referendum
      **/
-    ReferendumInvalid: GenericPalletError<Rv>;
+    ReferendumInvalid: GenericPalletError;
 
     /**
      * No proposals waiting
      **/
-    NoneWaiting: GenericPalletError<Rv>;
+    NoneWaiting: GenericPalletError;
 
     /**
      * The given account did not vote on the referendum.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed, either through `unvote` or `reap_vote`.
      **/
-    VotesExist: GenericPalletError<Rv>;
+    VotesExist: GenericPalletError;
 
     /**
      * The instant referendum origin is currently disallowed.
      **/
-    InstantNotAllowed: GenericPalletError<Rv>;
+    InstantNotAllowed: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Invalid upper bound.
      **/
-    WrongUpperBound: GenericPalletError<Rv>;
+    WrongUpperBound: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Maximum number of items reached.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Voting period too low
      **/
-    VotingPeriodLow: GenericPalletError<Rv>;
+    VotingPeriodLow: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommittee`'s errors
@@ -415,62 +415,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -479,37 +479,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting period is zero
      **/
-    ZeroVestingPeriod: GenericPalletError<Rv>;
+    ZeroVestingPeriod: GenericPalletError;
 
     /**
      * Number of vests is zero
      **/
-    ZeroVestingPeriodCount: GenericPalletError<Rv>;
+    ZeroVestingPeriodCount: GenericPalletError;
 
     /**
      * Insufficient amount of balance to lock
      **/
-    InsufficientBalanceToLock: GenericPalletError<Rv>;
+    InsufficientBalanceToLock: GenericPalletError;
 
     /**
      * This account have too many vesting schedules
      **/
-    TooManyVestingSchedules: GenericPalletError<Rv>;
+    TooManyVestingSchedules: GenericPalletError;
 
     /**
      * The vested transfer amount is too low
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * Failed because the maximum vesting schedules was exceeded
      **/
-    MaxVestingSchedulesExceeded: GenericPalletError<Rv>;
+    MaxVestingSchedulesExceeded: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -518,47 +518,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -567,92 +567,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -661,32 +661,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -695,47 +695,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -744,97 +744,97 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -843,137 +843,137 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -982,77 +982,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -1061,7 +1061,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -1072,32 +1072,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -1106,68 +1106,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1176,77 +1176,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -1255,32 +1255,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RelayChainInfo`'s errors
@@ -1289,7 +1289,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -1298,32 +1298,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -1332,48 +1332,48 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * No code upgrade has been authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The given code upgrade has not been authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -1383,129 +1383,129 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -1514,32 +1514,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -1549,32 +1549,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -1582,24 +1582,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRegistry`'s errors
@@ -1608,52 +1608,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID is not available. This only happens when it reaches the MAX value of given id type.
      **/
-    NoIdAvailable: GenericPalletError<Rv>;
+    NoIdAvailable: GenericPalletError;
 
     /**
      * Invalid asset name or symbol.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Invalid asset name or symbol.
      **/
-    TooLong: GenericPalletError<Rv>;
+    TooLong: GenericPalletError;
 
     /**
      * Asset ID is not registered in the asset-registry.
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Asset is already registered.
      **/
-    AssetAlreadyRegistered: GenericPalletError<Rv>;
+    AssetAlreadyRegistered: GenericPalletError;
 
     /**
      * Incorrect number of assets provided to create shared asset.
      **/
-    InvalidSharedAssetLen: GenericPalletError<Rv>;
+    InvalidSharedAssetLen: GenericPalletError;
 
     /**
      * Cannot update asset location
      **/
-    CannotUpdateLocation: GenericPalletError<Rv>;
+    CannotUpdateLocation: GenericPalletError;
 
     /**
      * Selected asset id is out of reserved range.
      **/
-    NotInReservedRange: GenericPalletError<Rv>;
+    NotInReservedRange: GenericPalletError;
 
     /**
      * Location already registered with different asset
      **/
-    LocationAlreadyRegistered: GenericPalletError<Rv>;
+    LocationAlreadyRegistered: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYK`'s errors
@@ -1662,134 +1662,134 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * It is not allowed to create a pool between same assets.
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than min trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Liquidity is zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * It is not allowed to create a pool with zero initial price.
      * Not used, kept for backward compatibility
      **/
-    ZeroInitialPrice: GenericPalletError<Rv>;
+    ZeroInitialPrice: GenericPalletError;
 
     /**
      * Overflow
      * Not used, kept for backward compatibility
      **/
-    CreatePoolAssetAmountInvalid: GenericPalletError<Rv>;
+    CreatePoolAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidMintedLiquidity: GenericPalletError<Rv>;
+    InvalidMintedLiquidity: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidLiquidityAmount: GenericPalletError<Rv>;
+    InvalidLiquidityAmount: GenericPalletError;
 
     /**
      * Asset amount has exceeded given limit.
      **/
-    AssetAmountExceededLimit: GenericPalletError<Rv>;
+    AssetAmountExceededLimit: GenericPalletError;
 
     /**
      * Asset amount has not reached given limit.
      **/
-    AssetAmountNotReachedLimit: GenericPalletError<Rv>;
+    AssetAmountNotReachedLimit: GenericPalletError;
 
     /**
      * Asset balance is not sufficient.
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Not enough asset liquidity in the pool.
      **/
-    InsufficientPoolAssetBalance: GenericPalletError<Rv>;
+    InsufficientPoolAssetBalance: GenericPalletError;
 
     /**
      * Not enough core asset liquidity in the pool.
      **/
-    InsufficientNativeCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientNativeCurrencyBalance: GenericPalletError;
 
     /**
      * Liquidity pool for given assets does not exist.
      **/
-    TokenPoolNotFound: GenericPalletError<Rv>;
+    TokenPoolNotFound: GenericPalletError;
 
     /**
      * Liquidity pool for given assets already exists.
      **/
-    TokenPoolAlreadyExists: GenericPalletError<Rv>;
+    TokenPoolAlreadyExists: GenericPalletError;
 
     /**
      * Overflow
      **/
-    AddAssetAmountInvalid: GenericPalletError<Rv>;
+    AddAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    RemoveAssetAmountInvalid: GenericPalletError<Rv>;
+    RemoveAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    SellAssetAmountInvalid: GenericPalletError<Rv>;
+    SellAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    BuyAssetAmountInvalid: GenericPalletError<Rv>;
+    BuyAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    CannotApplyDiscount: GenericPalletError<Rv>;
+    CannotApplyDiscount: GenericPalletError;
 
     /**
      * Max fraction of pool to buy in single transaction has been exceeded.
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Max fraction of pool to sell in single transaction has been exceeded.
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Pool cannot be created due to outside factors.
      **/
-    CannotCreatePool: GenericPalletError<Rv>;
+    CannotCreatePool: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Duster`'s errors
@@ -1798,37 +1798,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is excluded from dusting.
      **/
-    AccountBlacklisted: GenericPalletError<Rv>;
+    AccountBlacklisted: GenericPalletError;
 
     /**
      * Account is not present in the non-dustable list.
      **/
-    AccountNotBlacklisted: GenericPalletError<Rv>;
+    AccountNotBlacklisted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * The balance is sufficient to keep account open.
      **/
-    BalanceSufficient: GenericPalletError<Rv>;
+    BalanceSufficient: GenericPalletError;
 
     /**
      * Dust account is not set.
      **/
-    DustAccountNotSet: GenericPalletError<Rv>;
+    DustAccountNotSet: GenericPalletError;
 
     /**
      * Reserve account is not set.
      **/
-    ReserveAccountNotSet: GenericPalletError<Rv>;
+    ReserveAccountNotSet: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `LBP`'s errors
@@ -1837,122 +1837,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pool assets can not be the same
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Account is not a pool owner
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Sale already started
      **/
-    SaleStarted: GenericPalletError<Rv>;
+    SaleStarted: GenericPalletError;
 
     /**
      * Sale is still in progress
      **/
-    SaleNotEnded: GenericPalletError<Rv>;
+    SaleNotEnded: GenericPalletError;
 
     /**
      * Sale is not running
      **/
-    SaleIsNotRunning: GenericPalletError<Rv>;
+    SaleIsNotRunning: GenericPalletError;
 
     /**
      * Sale duration is too long
      **/
-    MaxSaleDurationExceeded: GenericPalletError<Rv>;
+    MaxSaleDurationExceeded: GenericPalletError;
 
     /**
      * Liquidity being added should not be zero
      **/
-    CannotAddZeroLiquidity: GenericPalletError<Rv>;
+    CannotAddZeroLiquidity: GenericPalletError;
 
     /**
      * Asset balance too low
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Pool does not exist
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * Pool has been already created
      **/
-    PoolAlreadyExists: GenericPalletError<Rv>;
+    PoolAlreadyExists: GenericPalletError;
 
     /**
      * Invalid block range
      **/
-    InvalidBlockRange: GenericPalletError<Rv>;
+    InvalidBlockRange: GenericPalletError;
 
     /**
      * Calculation error
      **/
-    WeightCalculationError: GenericPalletError<Rv>;
+    WeightCalculationError: GenericPalletError;
 
     /**
      * Weight set is out of range
      **/
-    InvalidWeight: GenericPalletError<Rv>;
+    InvalidWeight: GenericPalletError;
 
     /**
      * Can not perform a trade with zero amount
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Invalid fee amount
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Trading limit reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * An unexpected integer overflow occurred
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Nothing to update
      **/
-    NothingToUpdate: GenericPalletError<Rv>;
+    NothingToUpdate: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than minimum trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Not more than one fee collector per asset id
      **/
-    FeeCollectorWithAssetAlreadyUsed: GenericPalletError<Rv>;
+    FeeCollectorWithAssetAlreadyUsed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NFT`'s errors
@@ -1961,42 +1961,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Count of items overflown
      **/
-    NoAvailableItemId: GenericPalletError<Rv>;
+    NoAvailableItemId: GenericPalletError;
 
     /**
      * Count of collections overflown
      **/
-    NoAvailableCollectionId: GenericPalletError<Rv>;
+    NoAvailableCollectionId: GenericPalletError;
 
     /**
      * Collection still contains minted tokens
      **/
-    TokenCollectionNotEmpty: GenericPalletError<Rv>;
+    TokenCollectionNotEmpty: GenericPalletError;
 
     /**
      * Collection does not exist
      **/
-    CollectionUnknown: GenericPalletError<Rv>;
+    CollectionUnknown: GenericPalletError;
 
     /**
      * Item does not exist
      **/
-    ItemUnknown: GenericPalletError<Rv>;
+    ItemUnknown: GenericPalletError;
 
     /**
      * Operation not permitted
      **/
-    NotPermitted: GenericPalletError<Rv>;
+    NotPermitted: GenericPalletError;
 
     /**
      * ID reserved for runtime
      **/
-    IdReserved: GenericPalletError<Rv>;
+    IdReserved: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Marketplace`'s errors
@@ -2005,67 +2005,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not the owner of the token
      **/
-    NotTheTokenOwner: GenericPalletError<Rv>;
+    NotTheTokenOwner: GenericPalletError;
 
     /**
      * Cannot buy a token from yourself
      **/
-    BuyFromSelf: GenericPalletError<Rv>;
+    BuyFromSelf: GenericPalletError;
 
     /**
      * Token is currently not for sale
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * Collection or item does not exist
      **/
-    CollectionOrItemUnknown: GenericPalletError<Rv>;
+    CollectionOrItemUnknown: GenericPalletError;
 
     /**
      * Offer is lower than the minimum threshold
      **/
-    OfferTooLow: GenericPalletError<Rv>;
+    OfferTooLow: GenericPalletError;
 
     /**
      * No offer for this token found from the user
      **/
-    UnknownOffer: GenericPalletError<Rv>;
+    UnknownOffer: GenericPalletError;
 
     /**
      * Offer is no longer valid
      **/
-    OfferExpired: GenericPalletError<Rv>;
+    OfferExpired: GenericPalletError;
 
     /**
      * User already made an offer for this token
      **/
-    AlreadyOffered: GenericPalletError<Rv>;
+    AlreadyOffered: GenericPalletError;
 
     /**
      * User has to be offer maker or token owner to withdraw an offer
      **/
-    WithdrawNotAuthorized: GenericPalletError<Rv>;
+    WithdrawNotAuthorized: GenericPalletError;
 
     /**
      * User has to be the token owner to accept an offer
      **/
-    AcceptNotAuthorized: GenericPalletError<Rv>;
+    AcceptNotAuthorized: GenericPalletError;
 
     /**
      * Royalty can be set only once
      **/
-    RoyaltyAlreadySet: GenericPalletError<Rv>;
+    RoyaltyAlreadySet: GenericPalletError;
 
     /**
      * Royalty not in 0-9_999 range
      **/
-    NotInRange: GenericPalletError<Rv>;
+    NotInRange: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TransactionPause`'s errors
@@ -2074,22 +2074,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * can not pause
      **/
-    CannotPause: GenericPalletError<Rv>;
+    CannotPause: GenericPalletError;
 
     /**
      * invalid character encoding
      **/
-    InvalidCharacter: GenericPalletError<Rv>;
+    InvalidCharacter: GenericPalletError;
 
     /**
      * pallet name or function name is too long
      **/
-    NameTooLong: GenericPalletError<Rv>;
+    NameTooLong: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Router`'s errors
@@ -2098,57 +2098,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The trading limit has been reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * The the max number of trades limit is reached
      **/
-    MaxTradesExceeded: GenericPalletError<Rv>;
+    MaxTradesExceeded: GenericPalletError;
 
     /**
      * The AMM pool is not supported for executing trades
      **/
-    PoolNotSupported: GenericPalletError<Rv>;
+    PoolNotSupported: GenericPalletError;
 
     /**
      * The user has not enough balance to execute the trade
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * The calculation of route trade amounts failed in the underlying AMM
      **/
-    RouteCalculationFailed: GenericPalletError<Rv>;
+    RouteCalculationFailed: GenericPalletError;
 
     /**
      * The route is invalid
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * The route update was not successful
      **/
-    RouteUpdateIsNotSuccessful: GenericPalletError<Rv>;
+    RouteUpdateIsNotSuccessful: GenericPalletError;
 
     /**
      * Route contains assets that has no oracle data
      **/
-    RouteHasNoOracle: GenericPalletError<Rv>;
+    RouteHasNoOracle: GenericPalletError;
 
     /**
      * The route execution failed in the underlying AMM
      **/
-    InvalidRouteExecution: GenericPalletError<Rv>;
+    InvalidRouteExecution: GenericPalletError;
 
     /**
      * Trading same assets is not allowed.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKLiquidityMining`'s errors
@@ -2157,52 +2157,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Nft pallet didn't return an owner.
      **/
-    CantFindDepositOwner: GenericPalletError<Rv>;
+    CantFindDepositOwner: GenericPalletError;
 
     /**
      * Account balance of XYK pool shares is not sufficient.
      **/
-    InsufficientXykSharesBalance: GenericPalletError<Rv>;
+    InsufficientXykSharesBalance: GenericPalletError;
 
     /**
      * XYK pool does not exist
      **/
-    XykPoolDoesntExist: GenericPalletError<Rv>;
+    XykPoolDoesntExist: GenericPalletError;
 
     /**
      * Account is not deposit owner.
      **/
-    NotDepositOwner: GenericPalletError<Rv>;
+    NotDepositOwner: GenericPalletError;
 
     /**
      * XYK did not return assets for given pool id
      **/
-    CantGetXykAssets: GenericPalletError<Rv>;
+    CantGetXykAssets: GenericPalletError;
 
     /**
      * Deposit data not found
      **/
-    DepositDataNotFound: GenericPalletError<Rv>;
+    DepositDataNotFound: GenericPalletError;
 
     /**
      * Calculated reward to claim is 0.
      **/
-    ZeroClaimedRewards: GenericPalletError<Rv>;
+    ZeroClaimedRewards: GenericPalletError;
 
     /**
      * Asset is not in the `AssetPair`.
      **/
-    AssetNotInAssetPair: GenericPalletError<Rv>;
+    AssetNotInAssetPair: GenericPalletError;
 
     /**
      * Provided `AssetPair` is not used by the deposit.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKWarehouseLM`'s errors
@@ -2211,154 +2211,154 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Global farm does not exist.
      **/
-    GlobalFarmNotFound: GenericPalletError<Rv>;
+    GlobalFarmNotFound: GenericPalletError;
 
     /**
      * Yield farm does not exist.
      **/
-    YieldFarmNotFound: GenericPalletError<Rv>;
+    YieldFarmNotFound: GenericPalletError;
 
     /**
      * Multiple claims in the same period is not allowed.
      **/
-    DoubleClaimInPeriod: GenericPalletError<Rv>;
+    DoubleClaimInPeriod: GenericPalletError;
 
     /**
      * Liquidity mining is canceled.
      **/
-    LiquidityMiningCanceled: GenericPalletError<Rv>;
+    LiquidityMiningCanceled: GenericPalletError;
 
     /**
      * Liquidity mining is not canceled.
      **/
-    LiquidityMiningIsActive: GenericPalletError<Rv>;
+    LiquidityMiningIsActive: GenericPalletError;
 
     /**
      * Liquidity mining is in `active` or `terminated` state and action cannot be completed.
      **/
-    LiquidityMiningIsNotStopped: GenericPalletError<Rv>;
+    LiquidityMiningIsNotStopped: GenericPalletError;
 
     /**
      * LP shares amount is not valid.
      **/
-    InvalidDepositAmount: GenericPalletError<Rv>;
+    InvalidDepositAmount: GenericPalletError;
 
     /**
      * Account is not allowed to perform action.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Yield farm multiplier can't be 0.
      **/
-    InvalidMultiplier: GenericPalletError<Rv>;
+    InvalidMultiplier: GenericPalletError;
 
     /**
      * Yield farm with given `amm_pool_id` already exists in global farm.
      **/
-    YieldFarmAlreadyExists: GenericPalletError<Rv>;
+    YieldFarmAlreadyExists: GenericPalletError;
 
     /**
      * Loyalty curve's initial reward percentage is not valid. Valid range is: [0, 1).
      **/
-    InvalidInitialRewardPercentage: GenericPalletError<Rv>;
+    InvalidInitialRewardPercentage: GenericPalletError;
 
     /**
      * One or more yield farms exist in global farm.
      **/
-    GlobalFarmIsNotEmpty: GenericPalletError<Rv>;
+    GlobalFarmIsNotEmpty: GenericPalletError;
 
     /**
      * Farm's `incentivized_asset` is missing in provided asset pair.
      **/
-    MissingIncentivizedAsset: GenericPalletError<Rv>;
+    MissingIncentivizedAsset: GenericPalletError;
 
     /**
      * Reward currency balance is not sufficient.
      **/
-    InsufficientRewardCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientRewardCurrencyBalance: GenericPalletError;
 
     /**
      * Blocks per period can't be 0.
      **/
-    InvalidBlocksPerPeriod: GenericPalletError<Rv>;
+    InvalidBlocksPerPeriod: GenericPalletError;
 
     /**
      * Yield per period can't be 0.
      **/
-    InvalidYieldPerPeriod: GenericPalletError<Rv>;
+    InvalidYieldPerPeriod: GenericPalletError;
 
     /**
      * Total rewards is less than `MinTotalFarmRewards`.
      **/
-    InvalidTotalRewards: GenericPalletError<Rv>;
+    InvalidTotalRewards: GenericPalletError;
 
     /**
      * Planned yielding periods is less than `MinPlannedYieldingPeriods`.
      **/
-    InvalidPlannedYieldingPeriods: GenericPalletError<Rv>;
+    InvalidPlannedYieldingPeriods: GenericPalletError;
 
     /**
      * Maximum number of locks reached for deposit.
      **/
-    MaxEntriesPerDeposit: GenericPalletError<Rv>;
+    MaxEntriesPerDeposit: GenericPalletError;
 
     /**
      * Trying to lock LP shares into already locked yield farm.
      **/
-    DoubleLock: GenericPalletError<Rv>;
+    DoubleLock: GenericPalletError;
 
     /**
      * Yield farm entry doesn't exist for given deposit.
      **/
-    YieldFarmEntryNotFound: GenericPalletError<Rv>;
+    YieldFarmEntryNotFound: GenericPalletError;
 
     /**
      * Max number of yield farms in global farm was reached. Global farm can't accept new
      * yield farms until some yield farm is not removed from storage.
      **/
-    GlobalFarmIsFull: GenericPalletError<Rv>;
+    GlobalFarmIsFull: GenericPalletError;
 
     /**
      * Invalid min. deposit was set for global farm.
      **/
-    InvalidMinDeposit: GenericPalletError<Rv>;
+    InvalidMinDeposit: GenericPalletError;
 
     /**
      * Price adjustment multiplier can't be 0.
      **/
-    InvalidPriceAdjustment: GenericPalletError<Rv>;
+    InvalidPriceAdjustment: GenericPalletError;
 
     /**
      * Account creation from id failed.
      **/
-    ErrorGetAccountId: GenericPalletError<Rv>;
+    ErrorGetAccountId: GenericPalletError;
 
     /**
      * Value of deposited shares amount in reward currency is bellow min. limit.
      **/
-    IncorrectValuedShares: GenericPalletError<Rv>;
+    IncorrectValuedShares: GenericPalletError;
 
     /**
      * `reward_currency` is not registered in asset registry.
      **/
-    RewardCurrencyNotRegistered: GenericPalletError<Rv>;
+    RewardCurrencyNotRegistered: GenericPalletError;
 
     /**
      * `incentivized_asset` is not registered in asset registry.
      **/
-    IncentivizedAssetNotRegistered: GenericPalletError<Rv>;
+    IncentivizedAssetNotRegistered: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorRewards`'s errors
@@ -2367,7 +2367,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Broadcast`'s errors
@@ -2376,20 +2376,20 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EmaOracle`'s errors
    **/
   emaOracle: {
-    TooManyUniqueEntries: GenericPalletError<Rv>;
-    OnTradeValueZero: GenericPalletError<Rv>;
-    OracleNotFound: GenericPalletError<Rv>;
+    TooManyUniqueEntries: GenericPalletError;
+    OnTradeValueZero: GenericPalletError;
+    OracleNotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Currencies`'s errors
@@ -2398,27 +2398,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Unable to convert the Amount type into Balance.
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Deposit result is not expected
      **/
-    DepositFailed: GenericPalletError<Rv>;
+    DepositFailed: GenericPalletError;
 
     /**
      * Operation is not supported for this currency
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Tokens`'s errors
@@ -2427,43 +2427,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Cannot convert Amount into Balance type
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Failed because liquidity restrictions due to locking
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Failed because the maximum locks was exceeded
      **/
-    MaxLocksExceeded: GenericPalletError<Rv>;
+    MaxLocksExceeded: GenericPalletError;
 
     /**
      * Transfer/payment would kill account
      **/
-    KeepAlive: GenericPalletError<Rv>;
+    KeepAlive: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist
      **/
-    DeadAccount: GenericPalletError<Rv>;
-    TooManyReserves: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OrmlXcm`'s errors
@@ -2473,24 +2473,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The message and destination combination was not recognized as being
      * reachable.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The message and destination was recognized as being reachable but
      * the operation could not be completed.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XTokens`'s errors
@@ -2499,110 +2499,110 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset has no reserve location.
      **/
-    AssetHasNoReserve: GenericPalletError<Rv>;
+    AssetHasNoReserve: GenericPalletError;
 
     /**
      * Not cross-chain transfer.
      **/
-    NotCrossChainTransfer: GenericPalletError<Rv>;
+    NotCrossChainTransfer: GenericPalletError;
 
     /**
      * Invalid transfer destination.
      **/
-    InvalidDest: GenericPalletError<Rv>;
+    InvalidDest: GenericPalletError;
 
     /**
      * Currency is not cross-chain transferable.
      **/
-    NotCrossChainTransferableCurrency: GenericPalletError<Rv>;
+    NotCrossChainTransferableCurrency: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * XCM execution failed.
      **/
-    XcmExecutionFailed: GenericPalletError<Rv>;
+    XcmExecutionFailed: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the
      * destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Could not get ancestry of asset reserve location.
      **/
-    InvalidAncestry: GenericPalletError<Rv>;
+    InvalidAncestry: GenericPalletError;
 
     /**
      * The Asset is invalid.
      **/
-    InvalidAsset: GenericPalletError<Rv>;
+    InvalidAsset: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * We tried sending distinct asset and fee but they have different
      * reserve chains.
      **/
-    DistinctReserveForAssetAndFee: GenericPalletError<Rv>;
+    DistinctReserveForAssetAndFee: GenericPalletError;
 
     /**
      * The fee is zero.
      **/
-    ZeroFee: GenericPalletError<Rv>;
+    ZeroFee: GenericPalletError;
 
     /**
      * The transfering asset amount is zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * The number of assets to be sent is over the maximum.
      **/
-    TooManyAssetsBeingSent: GenericPalletError<Rv>;
+    TooManyAssetsBeingSent: GenericPalletError;
 
     /**
      * The specified index does not exist in a Assets struct.
      **/
-    AssetIndexNonExistent: GenericPalletError<Rv>;
+    AssetIndexNonExistent: GenericPalletError;
 
     /**
      * Fee is not enough.
      **/
-    FeeNotEnough: GenericPalletError<Rv>;
+    FeeNotEnough: GenericPalletError;
 
     /**
      * Not supported Location
      **/
-    NotSupportedLocation: GenericPalletError<Rv>;
+    NotSupportedLocation: GenericPalletError;
 
     /**
      * MinXcmFee not registered for certain reserve location
      **/
-    MinXcmFeeNotDefined: GenericPalletError<Rv>;
+    MinXcmFeeNotDefined: GenericPalletError;
 
     /**
      * Asset transfer is limited by RateLimiter.
      **/
-    RateLimited: GenericPalletError<Rv>;
+    RateLimited: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `UnknownTokens`'s errors
@@ -2611,21 +2611,21 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * The operation will cause balance to overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Unhandled asset.
      **/
-    UnhandledAsset: GenericPalletError<Rv>;
+    UnhandledAsset: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/basilisk/events.d.ts b/packages/chaintypes/src/basilisk/events.d.ts
index 8a3921b5..af8b24f2 100644
--- a/packages/chaintypes/src/basilisk/events.d.ts
+++ b/packages/chaintypes/src/basilisk/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchInfo,
   DispatchError,
@@ -52,7 +52,7 @@ import type {
   StagingXcmV4Asset,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -60,13 +60,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<Rv, 'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: DispatchInfo }
@@ -75,32 +74,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -109,40 +108,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -151,82 +149,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -237,7 +235,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -246,7 +243,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiTransactionPayment`'s events
@@ -257,7 +254,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [who, currency]
      **/
     CurrencySet: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'CurrencySet',
       { accountId: AccountId32; assetId: number }
@@ -267,20 +263,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New accepted currency added
      * [currency]
      **/
-    CurrencyAdded: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
+    CurrencyAdded: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
 
     /**
      * Accepted currency removed
      * [currency]
      **/
-    CurrencyRemoved: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
+    CurrencyRemoved: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
 
     /**
      * Transaction fee paid in non-native currency
      * [Account, Currency, Native fee amount, Non-native fee amount, Destination account]
      **/
     FeeWithdrawn: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'FeeWithdrawn',
       {
@@ -295,7 +290,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -304,38 +299,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -344,18 +333,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       { index: number; assetKind: []; amount: bigint; beneficiary: AccountId32; validFrom: number; expireAt: number }
@@ -364,28 +347,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -395,37 +378,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Democracy`'s events
@@ -434,68 +417,62 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion has been proposed by a public account.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
+    Proposed: GenericPalletEvent<'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * A public proposal has been tabled for referendum vote.
      **/
-    Tabled: GenericPalletEvent<Rv, 'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
+    Tabled: GenericPalletEvent<'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * An external proposal has been tabled.
      **/
-    ExternalTabled: GenericPalletEvent<Rv, 'Democracy', 'ExternalTabled', null>;
+    ExternalTabled: GenericPalletEvent<'Democracy', 'ExternalTabled', null>;
 
     /**
      * A referendum has begun.
      **/
-    Started: GenericPalletEvent<
-      Rv,
-      'Democracy',
-      'Started',
-      { refIndex: number; threshold: PalletDemocracyVoteThreshold }
-    >;
+    Started: GenericPalletEvent<'Democracy', 'Started', { refIndex: number; threshold: PalletDemocracyVoteThreshold }>;
 
     /**
      * A proposal has been approved by referendum.
      **/
-    Passed: GenericPalletEvent<Rv, 'Democracy', 'Passed', { refIndex: number }>;
+    Passed: GenericPalletEvent<'Democracy', 'Passed', { refIndex: number }>;
 
     /**
      * A proposal has been rejected by referendum.
      **/
-    NotPassed: GenericPalletEvent<Rv, 'Democracy', 'NotPassed', { refIndex: number }>;
+    NotPassed: GenericPalletEvent<'Democracy', 'NotPassed', { refIndex: number }>;
 
     /**
      * A referendum has been cancelled.
      **/
-    Cancelled: GenericPalletEvent<Rv, 'Democracy', 'Cancelled', { refIndex: number }>;
+    Cancelled: GenericPalletEvent<'Democracy', 'Cancelled', { refIndex: number }>;
 
     /**
      * An account has delegated their vote to another account.
      **/
-    Delegated: GenericPalletEvent<Rv, 'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
+    Delegated: GenericPalletEvent<'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
 
     /**
      * An account has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'Democracy', 'Undelegated', { account: AccountId32 }>;
+    Undelegated: GenericPalletEvent<'Democracy', 'Undelegated', { account: AccountId32 }>;
 
     /**
      * An external proposal has been vetoed.
      **/
-    Vetoed: GenericPalletEvent<Rv, 'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
+    Vetoed: GenericPalletEvent<'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
 
     /**
      * A proposal_hash has been blacklisted permanently.
      **/
-    Blacklisted: GenericPalletEvent<Rv, 'Democracy', 'Blacklisted', { proposalHash: H256 }>;
+    Blacklisted: GenericPalletEvent<'Democracy', 'Blacklisted', { proposalHash: H256 }>;
 
     /**
      * An account has voted in a referendum
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Democracy',
       'Voted',
       { voter: AccountId32; refIndex: number; vote: PalletDemocracyVoteAccountVote }
@@ -504,18 +481,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has seconded a proposal
      **/
-    Seconded: GenericPalletEvent<Rv, 'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
+    Seconded: GenericPalletEvent<'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
 
     /**
      * A proposal got canceled.
      **/
-    ProposalCanceled: GenericPalletEvent<Rv, 'Democracy', 'ProposalCanceled', { propIndex: number }>;
+    ProposalCanceled: GenericPalletEvent<'Democracy', 'ProposalCanceled', { propIndex: number }>;
 
     /**
      * Metadata for a proposal or a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataSet',
       {
@@ -535,7 +511,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a proposal or a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataCleared',
       {
@@ -555,7 +530,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata has been transferred to new owner.
      **/
     MetadataTransferred: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataTransferred',
       {
@@ -579,7 +553,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommittee`'s events
@@ -590,7 +564,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -601,7 +574,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -610,18 +582,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -631,7 +602,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -640,12 +610,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -655,7 +625,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Added new vesting schedule.
      **/
     VestingScheduleAdded: GenericPalletEvent<
-      Rv,
       'Vesting',
       'VestingScheduleAdded',
       { from: AccountId32; to: AccountId32; vestingSchedule: OrmlVestingVestingSchedule }
@@ -664,17 +633,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Claimed vesting.
      **/
-    Claimed: GenericPalletEvent<Rv, 'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
+    Claimed: GenericPalletEvent<'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Updated vesting schedules.
      **/
-    VestingSchedulesUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
+    VestingSchedulesUpdated: GenericPalletEvent<'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -683,14 +652,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: BasiliskRuntimeSystemProxyType; disambiguationIndex: number }
@@ -699,13 +667,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: BasiliskRuntimeSystemProxyType; delay: number }
@@ -715,7 +682,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: BasiliskRuntimeSystemProxyType; delay: number }
@@ -724,7 +690,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -734,7 +700,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -743,18 +708,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -763,13 +727,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -779,7 +742,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -788,13 +750,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -805,7 +766,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -814,7 +774,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -824,12 +784,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -838,22 +798,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -862,33 +822,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: bigint; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: bigint; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: bigint }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: bigint }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: bigint; item: bigint; from: AccountId32; to: AccountId32 }
@@ -897,38 +851,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: bigint }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: bigint }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: bigint }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: bigint }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: bigint; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -939,7 +892,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -950,7 +902,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -959,13 +910,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: bigint }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: bigint }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: bigint; data: Bytes; isFrozen: boolean }
@@ -974,13 +924,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: bigint; item: bigint; data: Bytes; isFrozen: boolean }
@@ -989,23 +938,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: bigint; successfulItems: Array<bigint> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: bigint; successfulItems: Array<bigint> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes; value: Bytes }
@@ -1015,7 +958,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes }
@@ -1025,7 +967,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: bigint | undefined }
@@ -1035,7 +976,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: bigint; maxSupply: number }
@@ -1045,7 +985,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: bigint; item: bigint; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -1054,13 +993,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: bigint; item: bigint; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -1069,7 +1007,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1078,23 +1016,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1104,7 +1041,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1113,23 +1049,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1139,7 +1069,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1150,7 +1079,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1159,23 +1087,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1184,19 +1111,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1205,7 +1131,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1215,7 +1141,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1225,7 +1150,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1235,7 +1159,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1251,7 +1174,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1260,7 +1182,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -1271,7 +1193,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -1280,22 +1201,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -1304,18 +1225,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account that has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1325,7 +1245,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote that been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1334,7 +1253,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -1344,7 +1263,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -1369,7 +1287,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -1394,7 +1311,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -1419,7 +1335,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -1439,7 +1354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -1465,7 +1379,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -1476,7 +1389,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -1491,7 +1403,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -1511,7 +1422,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1526,7 +1436,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1546,7 +1455,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1566,7 +1474,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1586,7 +1493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1606,7 +1512,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1631,7 +1536,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1651,7 +1555,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1670,16 +1573,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1688,7 +1590,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RelayChainInfo`'s events
@@ -1699,7 +1601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [ Parachain block number, Relaychain Block number ]
      **/
     CurrentBlockNumbers: GenericPalletEvent<
-      Rv,
       'RelayChainInfo',
       'CurrentBlockNumbers',
       { parachainBlockNumber: number; relaychainBlockNumber: number }
@@ -1708,7 +1609,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -1717,18 +1618,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -1738,7 +1638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1748,7 +1647,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1758,7 +1656,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1768,7 +1665,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1779,7 +1675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1789,7 +1684,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1798,7 +1692,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -1807,13 +1701,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -1822,18 +1715,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -1843,7 +1735,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -1852,7 +1743,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -1861,13 +1752,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
 
     /**
      * A XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -1884,7 +1774,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -1895,7 +1784,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV4Response }
@@ -1906,7 +1794,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1918,7 +1805,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -1935,7 +1821,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1947,7 +1832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1959,7 +1843,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV4Location; queryId: bigint; expectedLocation?: StagingXcmV4Location | undefined }
@@ -1975,7 +1858,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -1984,13 +1866,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -2002,7 +1883,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV4Location; result: number; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -2013,7 +1893,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV4Location; version: number }
@@ -2024,7 +1903,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV4Location; queryId: bigint; error: XcmV3TraitsError }
@@ -2035,7 +1913,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -2051,7 +1928,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -2063,7 +1939,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -2079,7 +1954,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -2089,7 +1963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -2100,7 +1973,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -2110,7 +1982,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV4Location; fees: StagingXcmV4AssetAssets }
@@ -2120,7 +1991,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -2129,12 +1999,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -2144,29 +2014,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV4TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV4TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -2175,12 +2040,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -2190,7 +2055,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -2218,7 +2082,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -2253,7 +2116,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -2283,7 +2145,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -2302,7 +2163,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRegistry`'s events
@@ -2312,7 +2173,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was registered.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Registered',
       { assetId: number; assetName: Bytes; assetType: PalletAssetRegistryAssetType }
@@ -2322,7 +2182,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was updated.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Updated',
       {
@@ -2338,7 +2197,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'MetadataSet',
       { assetId: number; symbol: Bytes; decimals: number }
@@ -2348,7 +2206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Native location set for an asset.
      **/
     LocationSet: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'LocationSet',
       { assetId: number; location: BasiliskRuntimeXcmAssetLocation }
@@ -2357,7 +2214,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYK`'s events
@@ -2367,7 +2224,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2377,7 +2233,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; shares: bigint }
@@ -2387,7 +2242,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolCreated',
       {
@@ -2404,7 +2258,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was destroyed.
      **/
     PoolDestroyed: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolDestroyed',
       { who: AccountId32; assetA: number; assetB: number; shareToken: number; pool: AccountId32 }
@@ -2415,7 +2268,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'SellExecuted',
       {
@@ -2435,7 +2287,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'BuyExecuted',
       {
@@ -2453,7 +2304,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Duster`'s events
@@ -2462,22 +2313,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Account dusted.
      **/
-    Dusted: GenericPalletEvent<Rv, 'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
+    Dusted: GenericPalletEvent<'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Account added to non-dustable list.
      **/
-    Added: GenericPalletEvent<Rv, 'Duster', 'Added', { who: AccountId32 }>;
+    Added: GenericPalletEvent<'Duster', 'Added', { who: AccountId32 }>;
 
     /**
      * Account removed from non-dustable list.
      **/
-    Removed: GenericPalletEvent<Rv, 'Duster', 'Removed', { who: AccountId32 }>;
+    Removed: GenericPalletEvent<'Duster', 'Removed', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `LBP`'s events
@@ -2486,18 +2337,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pool was created by the `CreatePool` origin.
      **/
-    PoolCreated: GenericPalletEvent<Rv, 'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolCreated: GenericPalletEvent<'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * Pool data were updated.
      **/
-    PoolUpdated: GenericPalletEvent<Rv, 'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolUpdated: GenericPalletEvent<'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2507,7 +2357,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool and the pool was destroyed.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2518,7 +2367,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'SellExecuted',
       {
@@ -2537,7 +2385,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'BuyExecuted',
       {
@@ -2554,7 +2401,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NFT`'s events
@@ -2564,7 +2411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A collection was created
      **/
     CollectionCreated: GenericPalletEvent<
-      Rv,
       'NFT',
       'CollectionCreated',
       { owner: AccountId32; collectionId: bigint; collectionType: PalletNftCollectionType; metadata: Bytes }
@@ -2574,7 +2420,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An item was minted
      **/
     ItemMinted: GenericPalletEvent<
-      Rv,
       'NFT',
       'ItemMinted',
       { owner: AccountId32; collectionId: bigint; itemId: bigint; metadata: Bytes }
@@ -2584,7 +2429,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An item was transferred
      **/
     ItemTransferred: GenericPalletEvent<
-      Rv,
       'NFT',
       'ItemTransferred',
       { from: AccountId32; to: AccountId32; collectionId: bigint; itemId: bigint }
@@ -2593,27 +2437,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An item was burned
      **/
-    ItemBurned: GenericPalletEvent<
-      Rv,
-      'NFT',
-      'ItemBurned',
-      { owner: AccountId32; collectionId: bigint; itemId: bigint }
-    >;
+    ItemBurned: GenericPalletEvent<'NFT', 'ItemBurned', { owner: AccountId32; collectionId: bigint; itemId: bigint }>;
 
     /**
      * A collection was destroyed
      **/
-    CollectionDestroyed: GenericPalletEvent<
-      Rv,
-      'NFT',
-      'CollectionDestroyed',
-      { owner: AccountId32; collectionId: bigint }
-    >;
+    CollectionDestroyed: GenericPalletEvent<'NFT', 'CollectionDestroyed', { owner: AccountId32; collectionId: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Marketplace`'s events
@@ -2623,7 +2457,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price for a token was updated
      **/
     TokenPriceUpdated: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'TokenPriceUpdated',
       { who: AccountId32; collection: bigint; item: bigint; price?: bigint | undefined }
@@ -2633,7 +2466,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Token was sold to a new owner
      **/
     TokenSold: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'TokenSold',
       { owner: AccountId32; buyer: AccountId32; collection: bigint; item: bigint; price: bigint }
@@ -2643,7 +2475,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Offer was placed on a token
      **/
     OfferPlaced: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'OfferPlaced',
       { who: AccountId32; collection: bigint; item: bigint; amount: bigint; expires: number }
@@ -2653,7 +2484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Offer was withdrawn
      **/
     OfferWithdrawn: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'OfferWithdrawn',
       { who: AccountId32; collection: bigint; item: bigint }
@@ -2663,7 +2493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Offer was accepted
      **/
     OfferAccepted: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'OfferAccepted',
       { who: AccountId32; collection: bigint; item: bigint; amount: bigint; maker: AccountId32 }
@@ -2673,7 +2502,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Royalty hs been paid to the author
      **/
     RoyaltyPaid: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'RoyaltyPaid',
       { collection: bigint; item: bigint; author: AccountId32; royalty: number; royaltyAmount: bigint }
@@ -2683,7 +2511,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Marketplace data has been added
      **/
     RoyaltyAdded: GenericPalletEvent<
-      Rv,
       'Marketplace',
       'RoyaltyAdded',
       { collection: bigint; item: bigint; author: AccountId32; royalty: number }
@@ -2692,7 +2519,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPause`'s events
@@ -2702,7 +2529,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Paused transaction
      **/
     TransactionPaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionPaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -2712,7 +2538,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unpaused transaction
      **/
     TransactionUnpaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionUnpaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -2721,7 +2546,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Router`'s events
@@ -2731,7 +2556,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The route with trades has been successfully executed
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Router',
       'Executed',
       { assetIn: number; assetOut: number; amountIn: bigint; amountOut: bigint; eventId: number }
@@ -2740,12 +2564,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The route with trades has been successfully executed
      **/
-    RouteUpdated: GenericPalletEvent<Rv, 'Router', 'RouteUpdated', { assetIds: Array<number> }>;
+    RouteUpdated: GenericPalletEvent<'Router', 'RouteUpdated', { assetIds: Array<number> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKLiquidityMining`'s events
@@ -2755,7 +2579,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New global farm was created.
      **/
     GlobalFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmCreated',
       {
@@ -2777,7 +2600,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm's `price_adjustment` was updated.
      **/
     GlobalFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmUpdated',
       { id: number; priceAdjustment: FixedU128 }
@@ -2787,7 +2609,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New yield farm was added into the farm.
      **/
     YieldFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmCreated',
       {
@@ -2803,7 +2624,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was terminated.
      **/
     GlobalFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmTerminated',
       { globalFarmId: number; who: AccountId32; rewardCurrency: number; undistributedRewards: bigint }
@@ -2813,7 +2633,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New LP tokens was deposited.
      **/
     SharesDeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesDeposited',
       {
@@ -2830,7 +2649,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP token was redeposited for a new yield farm entry
      **/
     SharesRedeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesRedeposited',
       {
@@ -2847,7 +2665,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards was claimed.
      **/
     RewardClaimed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'RewardClaimed',
       {
@@ -2864,7 +2681,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP tokens was withdrawn.
      **/
     SharesWithdrawn: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesWithdrawn',
       {
@@ -2881,7 +2697,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was stopped.
      **/
     YieldFarmStopped: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmStopped',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -2891,7 +2706,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was resumed.
      **/
     YieldFarmResumed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmResumed',
       {
@@ -2907,7 +2721,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm was terminated from global farm.
      **/
     YieldFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmTerminated',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -2917,7 +2730,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm multiplier was updated.
      **/
     YieldFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmUpdated',
       {
@@ -2933,7 +2745,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NFT representing deposit has been destroyed
      **/
     DepositDestroyed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'DepositDestroyed',
       { who: AccountId32; depositId: bigint }
@@ -2942,7 +2753,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKWarehouseLM`'s events
@@ -2952,7 +2763,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm accumulated reward per share was updated.
      **/
     GlobalFarmAccRPZUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'GlobalFarmAccRPZUpdated',
       { globalFarmId: number; accumulatedRpz: FixedU128; totalSharesZ: bigint }
@@ -2962,7 +2772,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm accumulated reward per valued share was updated.
      **/
     YieldFarmAccRPVSUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'YieldFarmAccRPVSUpdated',
       { globalFarmId: number; yieldFarmId: number; accumulatedRpvs: FixedU128; totalValuedShares: bigint }
@@ -2971,12 +2780,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Global farm has no more rewards to distribute in the moment.
      **/
-    AllRewardsDistributed: GenericPalletEvent<Rv, 'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
+    AllRewardsDistributed: GenericPalletEvent<'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorRewards`'s events
@@ -2986,7 +2795,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Collator was rewarded.
      **/
     CollatorRewarded: GenericPalletEvent<
-      Rv,
       'CollatorRewards',
       'CollatorRewarded',
       { who: AccountId32; amount: bigint; currency: number }
@@ -2995,7 +2803,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Broadcast`'s events
@@ -3005,7 +2813,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Trade executed.
      **/
     Swapped: GenericPalletEvent<
-      Rv,
       'Broadcast',
       'Swapped',
       {
@@ -3023,7 +2830,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EmaOracle`'s events
@@ -3033,7 +2840,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was added to the whitelist.
      **/
     AddedToWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'AddedToWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -3043,7 +2849,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was removed from the whitelist.
      **/
     RemovedFromWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'RemovedFromWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -3052,7 +2857,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Currencies`'s events
@@ -3062,7 +2867,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Currency transfer success.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Currencies',
       'Transferred',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -3072,7 +2876,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Update balance success.
      **/
     BalanceUpdated: GenericPalletEvent<
-      Rv,
       'Currencies',
       'BalanceUpdated',
       { currencyId: number; who: AccountId32; amount: bigint }
@@ -3081,27 +2884,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposit success.
      **/
-    Deposited: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Deposited',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Deposited: GenericPalletEvent<'Currencies', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Withdraw success.
      **/
-    Withdrawn: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Withdrawn',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Withdrawn: GenericPalletEvent<'Currencies', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Tokens`'s events
@@ -3110,19 +2903,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Endowed: GenericPalletEvent<'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below
      * ExistentialDeposit, resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
     Transfer: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Transfer',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -3131,24 +2923,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<
-      Rv,
-      'Tokens',
-      'Unreserved',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Unreserved: GenericPalletEvent<'Tokens', 'Unreserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some reserved balance was repatriated (moved from reserved to
      * another account).
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Tokens',
       'ReserveRepatriated',
       {
@@ -3164,7 +2950,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A balance was set by root.
      **/
     BalanceSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'BalanceSet',
       { currencyId: number; who: AccountId32; free: bigint; reserved: bigint }
@@ -3173,18 +2958,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The total issuance of an currency has been set
      **/
-    TotalIssuanceSet: GenericPalletEvent<Rv, 'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
+    TotalIssuanceSet: GenericPalletEvent<'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
 
     /**
      * Some balances were withdrawn (e.g. pay for transaction fee)
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balances were slashed (e.g. due to mis-behavior)
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Slashed',
       { currencyId: number; who: AccountId32; freeAmount: bigint; reservedAmount: bigint }
@@ -3193,13 +2977,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposited some balance into an account
      **/
-    Deposited: GenericPalletEvent<Rv, 'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some funds are locked
      **/
     LockSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockSet',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32; amount: bigint }
@@ -3209,7 +2992,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some locked funds were unlocked
      **/
     LockRemoved: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockRemoved',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32 }
@@ -3218,19 +3000,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some free balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some locked balance was freed.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
-    Issued: GenericPalletEvent<Rv, 'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
-    Rescinded: GenericPalletEvent<Rv, 'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OrmlXcm`'s events
@@ -3239,12 +3021,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * XCM message sent. \[to, message\]
      **/
-    Sent: GenericPalletEvent<Rv, 'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
+    Sent: GenericPalletEvent<'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XTokens`'s events
@@ -3254,7 +3036,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transferred `Asset` with fee.
      **/
     TransferredAssets: GenericPalletEvent<
-      Rv,
       'XTokens',
       'TransferredAssets',
       { sender: AccountId32; assets: StagingXcmV4AssetAssets; fee: StagingXcmV4Asset; dest: StagingXcmV4Location }
@@ -3263,7 +3044,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `UnknownTokens`'s events
@@ -3273,7 +3054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deposit success.
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Deposited',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -3283,7 +3063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdraw success.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Withdrawn',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -3292,6 +3071,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/basilisk/index.d.ts b/packages/chaintypes/src/basilisk/index.d.ts
index 3f717b9e..9e5080b5 100644
--- a/packages/chaintypes/src/basilisk/index.d.ts
+++ b/packages/chaintypes/src/basilisk/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { AccountId32 } from 'dedot/codecs';
 import type {
   BasiliskRuntimeRuntimeCall,
@@ -37,26 +37,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameSystemExtensionsCheckWeight,
     PalletTransactionPaymentChargeTransactionPayment,
   ];
-}
-
-export interface VersionedBasiliskApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: BasiliskApi
  * @specVersion: 127
  **/
-export interface BasiliskApi {
-  legacy: VersionedBasiliskApi<RpcLegacy>;
-  v2: VersionedBasiliskApi<RpcV2>;
+export interface BasiliskApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/basilisk/json-rpc.d.ts b/packages/chaintypes/src/basilisk/json-rpc.d.ts
index b038aa8a..e037aac9 100644
--- a/packages/chaintypes/src/basilisk/json-rpc.d.ts
+++ b/packages/chaintypes/src/basilisk/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_unstable_body'
   | 'archive_unstable_call'
@@ -89,4 +89,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/basilisk/query.d.ts b/packages/chaintypes/src/basilisk/query.d.ts
index 0c348463..b2dc5a1c 100644
--- a/packages/chaintypes/src/basilisk/query.d.ts
+++ b/packages/chaintypes/src/basilisk/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -104,7 +104,7 @@ import type {
   StagingXcmV4Location,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -115,35 +115,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -151,7 +151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -159,28 +159,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -193,14 +193,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -217,21 +217,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -239,26 +239,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -269,7 +269,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -279,12 +279,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -295,14 +295,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -333,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -344,7 +344,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -354,7 +354,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -362,7 +362,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -370,12 +370,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -385,18 +385,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiTransactionPayment`'s storage queries
@@ -408,7 +408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    accountCurrencyMap: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    accountCurrencyMap: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Curated list of currencies which fees can be paid mapped to corresponding fallback price
@@ -416,7 +416,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencies: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencies: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      * Asset prices from the spot price provider or the fallback price if the price is not available. Updated at the beginning of every block.
@@ -424,19 +424,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencyPrice: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencyPrice: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    transactionCurrencyOverride: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    transactionCurrencyOverride: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -447,7 +447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -455,28 +455,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -484,12 +484,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -500,14 +500,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -517,14 +517,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -532,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -542,7 +542,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -553,7 +553,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -561,7 +561,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -571,10 +571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -583,7 +580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -591,7 +588,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -605,7 +602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -613,7 +609,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -624,7 +620,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -632,7 +628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<BasiliskRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => BasiliskRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => BasiliskRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -640,33 +636,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -680,12 +676,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<OrmlVestingVestingSchedule>> =} callback
      **/
-    vestingSchedules: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
+    vestingSchedules: GenericStorageQuery<(arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -698,11 +694,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -710,16 +702,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -730,12 +718,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -746,7 +734,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -757,7 +745,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -765,7 +753,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -774,7 +762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -783,12 +771,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -799,14 +787,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -814,7 +802,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -822,7 +810,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -833,7 +821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -841,11 +829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<BasiliskRuntimeOpaqueSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => BasiliskRuntimeOpaqueSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => BasiliskRuntimeOpaqueSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -854,7 +838,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -862,7 +845,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -873,7 +856,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -882,12 +865,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -899,7 +882,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -907,19 +890,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -931,7 +914,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
+    class: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -939,7 +922,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -949,7 +932,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, bigint, bigint]) => [] | undefined,
       [AccountId32, bigint, bigint]
     >;
@@ -961,7 +943,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, bigint]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
 
     /**
      * The items in existence and their ownership details.
@@ -969,7 +951,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
+    asset: GenericStorageQuery<(arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
 
     /**
      * Metadata of a collection.
@@ -977,7 +959,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
+    classMetadataOf: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
 
     /**
      * Metadata of an item.
@@ -986,7 +968,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletUniquesItemMetadata | undefined,
       [bigint, bigint]
     >;
@@ -998,7 +979,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [bigint, bigint | undefined, Bytes]
     >;
@@ -1010,7 +990,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => [bigint, AccountId32 | undefined] | undefined,
       [bigint, bigint]
     >;
@@ -1021,12 +1000,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    collectionMaxSupply: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1042,7 +1021,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -1054,7 +1032,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1066,7 +1044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1076,7 +1054,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1085,7 +1063,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -1100,7 +1077,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1113,12 +1090,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1131,7 +1108,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1139,7 +1115,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -1153,7 +1129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -1162,7 +1138,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -1171,12 +1147,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1190,7 +1166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1203,12 +1178,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1219,7 +1194,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1227,7 +1202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1238,7 +1213,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1246,7 +1221,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1259,12 +1234,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1275,12 +1250,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -1290,7 +1265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -1298,7 +1273,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -1306,11 +1281,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -1321,12 +1292,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -1342,7 +1313,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -1352,7 +1323,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -1366,7 +1336,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -1377,7 +1347,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -1386,14 +1356,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -1402,7 +1372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -1415,7 +1385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -1426,7 +1396,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -1438,7 +1408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -1452,7 +1422,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -1466,7 +1435,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -1476,7 +1445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -1487,7 +1456,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -1498,7 +1466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -1507,7 +1475,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -1516,7 +1484,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -1525,21 +1493,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -1547,7 +1515,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -1555,7 +1523,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -1563,7 +1531,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -1572,12 +1540,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -1587,12 +1555,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1603,7 +1571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1611,7 +1579,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1622,7 +1590,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1630,7 +1598,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1639,7 +1607,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1651,7 +1618,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1664,7 +1630,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1676,14 +1641,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1692,7 +1657,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1704,7 +1668,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1714,7 +1677,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1727,7 +1690,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1739,12 +1702,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV4Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV4Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV4Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1762,7 +1725,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1774,7 +1737,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1783,7 +1746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1795,7 +1757,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1805,14 +1766,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1821,7 +1782,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1829,7 +1789,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1842,7 +1802,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1852,7 +1811,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1861,7 +1820,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1869,7 +1827,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRegistry`'s storage queries
@@ -1881,14 +1839,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetDetails | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
 
     /**
      * Next available asset id. This is sequential id assigned for each new registered asset.
      *
      * @param {Callback<number> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number>;
+    nextAssetId: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between asset name and asset id.
@@ -1896,7 +1854,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    assetIds: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    assetIds: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Native location of an asset.
@@ -1904,7 +1862,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<BasiliskRuntimeXcmAssetLocation | undefined> =} callback
      **/
-    assetLocations: GenericStorageQuery<Rv, (arg: number) => BasiliskRuntimeXcmAssetLocation | undefined, number>;
+    assetLocations: GenericStorageQuery<(arg: number) => BasiliskRuntimeXcmAssetLocation | undefined, number>;
 
     /**
      * Local asset for native location.
@@ -1913,7 +1871,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     locationAssets: GenericStorageQuery<
-      Rv,
       (arg: BasiliskRuntimeXcmAssetLocation) => number | undefined,
       BasiliskRuntimeXcmAssetLocation
     >;
@@ -1924,12 +1881,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetMetadata | undefined> =} callback
      **/
-    assetMetadataMap: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetMetadata | undefined, number>;
+    assetMetadataMap: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetMetadata | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYK`'s storage queries
@@ -1941,7 +1898,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    shareToken: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    shareToken: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total liquidity in a pool.
@@ -1949,7 +1906,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalLiquidity: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    totalLiquidity: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Asset pair in a pool.
@@ -1957,12 +1914,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    poolAssets: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
+    poolAssets: GenericStorageQuery<(arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Duster`'s storage queries
@@ -1974,26 +1931,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    accountBlacklist: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    accountBlacklist: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Account to take reward from.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    rewardAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    rewardAccount: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Account to send dust to.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    dustAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    dustAccount: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `LBP`'s storage queries
@@ -2005,7 +1962,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletLbpPool | undefined> =} callback
      **/
-    poolData: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
+    poolData: GenericStorageQuery<(arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
 
     /**
      * Storage used for tracking existing fee collectors
@@ -2014,12 +1971,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<boolean> =} callback
      **/
-    feeCollectorWithAsset: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
+    feeCollectorWithAsset: GenericStorageQuery<(arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NFT`'s storage queries
@@ -2031,7 +1988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletNftCollectionInfo | undefined> =} callback
      **/
-    collections: GenericStorageQuery<Rv, (arg: bigint) => PalletNftCollectionInfo | undefined, bigint>;
+    collections: GenericStorageQuery<(arg: bigint) => PalletNftCollectionInfo | undefined, bigint>;
 
     /**
      * Stores item info
@@ -2039,12 +1996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletNftItemInfo | undefined> =} callback
      **/
-    items: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletNftItemInfo | undefined, [bigint, bigint]>;
+    items: GenericStorageQuery<(arg: [bigint, bigint]) => PalletNftItemInfo | undefined, [bigint, bigint]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Marketplace`'s storage queries
@@ -2056,7 +2013,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    prices: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => bigint | undefined, [bigint, bigint]>;
+    prices: GenericStorageQuery<(arg: [bigint, bigint]) => bigint | undefined, [bigint, bigint]>;
 
     /**
      * Stores offer info
@@ -2065,7 +2022,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMarketplaceOffer | undefined> =} callback
      **/
     offers: GenericStorageQuery<
-      Rv,
       (arg: [[bigint, bigint], AccountId32Like]) => PalletMarketplaceOffer | undefined,
       [[bigint, bigint], AccountId32]
     >;
@@ -2077,7 +2033,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMarketplaceRoyalty | undefined> =} callback
      **/
     marketplaceItems: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletMarketplaceRoyalty | undefined,
       [bigint, bigint]
     >;
@@ -2085,7 +2040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPause`'s storage queries
@@ -2099,12 +2054,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedTransactions: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedTransactions: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Router`'s storage queries
@@ -2115,7 +2070,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRouteExecutorSkipEd | undefined> =} callback
      **/
-    skipEd: GenericStorageQuery<Rv, () => PalletRouteExecutorSkipEd | undefined>;
+    skipEd: GenericStorageQuery<() => PalletRouteExecutorSkipEd | undefined>;
 
     /**
      * Storing routes for asset pairs
@@ -2124,7 +2079,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<HydradxTraitsRouterTrade> | undefined> =} callback
      **/
     routes: GenericStorageQuery<
-      Rv,
       (arg: HydradxTraitsRouterAssetPair) => Array<HydradxTraitsRouterTrade> | undefined,
       HydradxTraitsRouterAssetPair
     >;
@@ -2132,7 +2086,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYKWarehouseLM`'s storage queries
@@ -2143,20 +2097,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -2165,7 +2119,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [AccountId32, number, number]
     >;
@@ -2176,7 +2129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -2184,16 +2137,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => number | undefined,
-      [AccountId32, number]
-    >;
+    activeYieldFarm: GenericStorageQuery<(arg: [AccountId32Like, number]) => number | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorRewards`'s storage queries
@@ -2205,12 +2154,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    collators: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32>, number>;
+    collators: GenericStorageQuery<(arg: number) => Array<AccountId32>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broadcast`'s storage queries
@@ -2221,14 +2170,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    incrementalId: GenericStorageQuery<Rv, () => number>;
+    incrementalId: GenericStorageQuery<() => number>;
 
     /**
      * Execution context to figure out where the trade is originated from
      *
      * @param {Callback<Array<PalletBroadcastExecutionType>> =} callback
      **/
-    executionContext: GenericStorageQuery<Rv, () => Array<PalletBroadcastExecutionType>>;
+    executionContext: GenericStorageQuery<() => Array<PalletBroadcastExecutionType>>;
 
     /**
      * To handle the overflow of increasing the execution context.
@@ -2237,12 +2186,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    overflowCount: GenericStorageQuery<Rv, () => number>;
+    overflowCount: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmaOracle`'s storage queries
@@ -2253,7 +2202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>> =} callback
      **/
-    accumulator: GenericStorageQuery<Rv, () => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
+    accumulator: GenericStorageQuery<() => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
 
     /**
      * Oracle storage keyed by data source, involved asset ids and the period length of the oracle.
@@ -2264,7 +2213,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletEmaOracleOracleEntry, number] | undefined> =} callback
      **/
     oracles: GenericStorageQuery<
-      Rv,
       (
         arg: [FixedBytes<8>, [number, number], HydradxTraitsOracleOraclePeriod],
       ) => [PalletEmaOracleOracleEntry, number] | undefined,
@@ -2276,12 +2224,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[FixedBytes<8>, [number, number]]>> =} callback
      **/
-    whitelistedAssets: GenericStorageQuery<Rv, () => Array<[FixedBytes<8>, [number, number]]>>;
+    whitelistedAssets: GenericStorageQuery<() => Array<[FixedBytes<8>, [number, number]]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tokens`'s storage queries
@@ -2293,7 +2241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    totalIssuance: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Any liquidity locks of a token type under an account.
@@ -2302,11 +2250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<Array<OrmlTokensBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>,
-      [AccountId32, number]
-    >;
+    locks: GenericStorageQuery<(arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>, [AccountId32, number]>;
 
     /**
      * The balance of a token type under an account.
@@ -2319,7 +2263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<OrmlTokensAccountData> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
+    accounts: GenericStorageQuery<(arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
 
     /**
      * Named reserves on some account balances.
@@ -2328,7 +2272,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<OrmlTokensReserveData>> =} callback
      **/
     reserves: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => Array<OrmlTokensReserveData>,
       [AccountId32, number]
     >;
@@ -2336,7 +2279,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `UnknownTokens`'s storage queries
@@ -2352,7 +2295,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     concreteFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, StagingXcmV4Location]) => bigint,
       [StagingXcmV4Location, StagingXcmV4Location]
     >;
@@ -2367,7 +2309,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     abstractFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, BytesLike]) => bigint,
       [StagingXcmV4Location, Bytes]
     >;
@@ -2375,6 +2316,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/basilisk/runtime.d.ts b/packages/chaintypes/src/basilisk/runtime.d.ts
index ede29946..391747e9 100644
--- a/packages/chaintypes/src/basilisk/runtime.d.ts
+++ b/packages/chaintypes/src/basilisk/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   Option,
   OpaqueMetadata,
@@ -27,7 +27,7 @@ import type {
   Text,
 } from 'dedot/codecs';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
    * @version: 2
@@ -39,26 +39,26 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<Option<OpaqueMetadata>>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<Option<OpaqueMetadata>>>;
 
     /**
      * Returns the supported metadata versions.
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Returns the metadata of a runtime.
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<OpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<OpaqueMetadata>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -70,7 +70,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: BlockBuilder_apply_extrinsic
      * @param {OpaqueExtrinsicLike} extrinsic
      **/
-    applyExtrinsic: GenericRuntimeApiMethod<Rv, (extrinsic: OpaqueExtrinsicLike) => Promise<ApplyExtrinsicResult>>;
+    applyExtrinsic: GenericRuntimeApiMethod<(extrinsic: OpaqueExtrinsicLike) => Promise<ApplyExtrinsicResult>>;
 
     /**
      *
@@ -78,25 +78,25 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Block} block
      * @param {InherentData} data
      **/
-    checkInherents: GenericRuntimeApiMethod<Rv, (block: Block, data: InherentData) => Promise<CheckInherentsResult>>;
+    checkInherents: GenericRuntimeApiMethod<(block: Block, data: InherentData) => Promise<CheckInherentsResult>>;
 
     /**
      *
      * @callname: BlockBuilder_inherent_extrinsics
      * @param {InherentData} inherent
      **/
-    inherentExtrinsics: GenericRuntimeApiMethod<Rv, (inherent: InherentData) => Promise<Array<OpaqueExtrinsic>>>;
+    inherentExtrinsics: GenericRuntimeApiMethod<(inherent: InherentData) => Promise<Array<OpaqueExtrinsic>>>;
 
     /**
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -112,14 +112,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BlockHash} blockHash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (source: TransactionSource, tx: OpaqueExtrinsicLike, blockHash: BlockHash) => Promise<TransactionValidity>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -132,12 +131,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -156,7 +155,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {Option<BytesLike>} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: Option<BytesLike>) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: Option<BytesLike>) => Promise<Bytes>>;
 
     /**
      * Decode the given public session key
@@ -166,12 +165,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_decode_session_keys
      * @param {BytesLike} encoded
      **/
-    decodeSessionKeys: GenericRuntimeApiMethod<Rv, (encoded: BytesLike) => Promise<Option<Array<[Bytes, KeyTypeId]>>>>;
+    decodeSessionKeys: GenericRuntimeApiMethod<(encoded: BytesLike) => Promise<Option<Array<[Bytes, KeyTypeId]>>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -184,12 +183,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} accountId
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<Nonce>>;
+    accountNonce: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<Nonce>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -203,7 +202,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {OpaqueExtrinsicLike} uxt
      * @param {number} len
      **/
-    queryInfo: GenericRuntimeApiMethod<Rv, (uxt: OpaqueExtrinsicLike, len: number) => Promise<RuntimeDispatchInfo>>;
+    queryInfo: GenericRuntimeApiMethod<(uxt: OpaqueExtrinsicLike, len: number) => Promise<RuntimeDispatchInfo>>;
 
     /**
      * The transaction fee details
@@ -212,7 +211,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {OpaqueExtrinsicLike} uxt
      * @param {number} len
      **/
-    queryFeeDetails: GenericRuntimeApiMethod<Rv, (uxt: OpaqueExtrinsicLike, len: number) => Promise<FeeDetails>>;
+    queryFeeDetails: GenericRuntimeApiMethod<(uxt: OpaqueExtrinsicLike, len: number) => Promise<FeeDetails>>;
 
     /**
      * Query the output of the current LengthToFee given some input
@@ -220,7 +219,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<Balance>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<Balance>>;
 
     /**
      * Query the output of the current WeightToFee given some input
@@ -228,12 +227,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: Weight) => Promise<Balance>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: Weight) => Promise<Balance>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -248,7 +247,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_create_default_config
      **/
-    createDefaultConfig: GenericRuntimeApiMethod<Rv, () => Promise<Bytes>>;
+    createDefaultConfig: GenericRuntimeApiMethod<() => Promise<Bytes>>;
 
     /**
      * Build `GenesisConfig` from a JSON blob not using any defaults and store it in the storage.
@@ -262,11 +261,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_config
      * @param {BytesLike} json
      **/
-    buildConfig: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], Text>>>;
+    buildConfig: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], Text>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/basilisk/tx.d.ts b/packages/chaintypes/src/basilisk/tx.d.ts
index c96d36c0..4807877f 100644
--- a/packages/chaintypes/src/basilisk/tx.d.ts
+++ b/packages/chaintypes/src/basilisk/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   AccountId32Like,
@@ -68,16 +66,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = BasiliskRuntimeRuntimeCallLike,
-> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<BasiliskRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -90,16 +90,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -109,16 +108,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -128,16 +126,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -150,16 +147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -169,16 +165,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -188,16 +183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -211,19 +205,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -233,16 +226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -255,16 +247,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -281,16 +272,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -308,23 +298,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -354,23 +343,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -389,19 +377,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -414,20 +401,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -443,19 +429,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -480,19 +465,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -505,19 +489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -534,16 +517,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -556,19 +538,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: AccountId32Like; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -583,19 +564,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -612,26 +592,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiTransactionPayment`'s transaction calls
@@ -655,16 +634,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     setCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'SetCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -681,19 +659,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} price
      **/
     addCurrency: GenericTxCall<
-      Rv,
       (
         currency: number,
         price: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'AddCurrency';
             params: { currency: number; price: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -708,16 +685,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     removeCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'RemoveCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -731,16 +707,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} accountId
      **/
     resetPaymentCurrency: GenericTxCall<
-      Rv,
       (accountId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'ResetPaymentCurrency';
             params: { accountId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -761,7 +736,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} s
      **/
     dispatchPermit: GenericTxCall<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -773,7 +747,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         r: H256,
         s: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
@@ -790,14 +763,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               s: H256;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -826,19 +800,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -868,16 +841,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -915,21 +887,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: [],
         amount: bigint,
         beneficiary: AccountId32Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Spend';
             params: { assetKind: []; amount: bigint; beneficiary: AccountId32Like; validFrom: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -957,16 +928,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -994,16 +964,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1028,23 +997,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1073,16 +1041,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BasiliskRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<BasiliskRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<BasiliskRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1105,19 +1072,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: BasiliskRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1139,16 +1105,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BasiliskRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<BasiliskRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<BasiliskRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1164,19 +1129,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: BasiliskRuntimeOriginCaller,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: BasiliskRuntimeOriginCaller; call: BasiliskRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1198,16 +1162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BasiliskRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<BasiliskRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<BasiliskRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1223,26 +1186,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: BasiliskRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: BasiliskRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Democracy`'s transaction calls
@@ -1263,19 +1225,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     propose: GenericTxCall<
-      Rv,
       (
         proposal: FrameSupportPreimagesBounded,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Propose';
             params: { proposal: FrameSupportPreimagesBounded; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1290,16 +1251,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposal
      **/
     second: GenericTxCall<
-      Rv,
       (proposal: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Second';
             params: { proposal: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1316,19 +1276,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDemocracyVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         refIndex: number,
         vote: PalletDemocracyVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Vote';
             params: { refIndex: number; vote: PalletDemocracyVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1345,16 +1304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     emergencyCancel: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'EmergencyCancel';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1369,16 +1327,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalPropose: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalPropose';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1398,16 +1355,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeMajority: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeMajority';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1427,16 +1383,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeDefault: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeDefault';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1463,20 +1418,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     fastTrack: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         votingPeriod: number,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'FastTrack';
             params: { proposalHash: H256; votingPeriod: number; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1494,16 +1448,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     vetoExternal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'VetoExternal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1519,16 +1472,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     cancelReferendum: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelReferendum';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1559,20 +1511,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         to: AccountId32Like,
         conviction: PalletDemocracyConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Delegate';
             params: { to: AccountId32Like; conviction: PalletDemocracyConviction; balance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1592,15 +1543,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     undelegate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Undelegate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1613,15 +1563,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPublicProposals: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ClearPublicProposals';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1637,16 +1586,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Unlock';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1682,16 +1630,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveVote';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1716,19 +1663,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1753,19 +1699,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeRefIndex
      **/
     blacklist: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         maybeRefIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Blacklist';
             params: { proposalHash: H256; maybeRefIndex: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1781,16 +1726,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} propIndex
      **/
     cancelProposal: GenericTxCall<
-      Rv,
       (propIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelProposal';
             params: { propIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1815,26 +1759,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         owner: PalletDemocracyMetadataOwner,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'SetMetadata';
             params: { owner: PalletDemocracyMetadataOwner; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommittee`'s transaction calls
@@ -1871,20 +1814,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1903,19 +1845,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: BasiliskRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Execute';
             params: { proposal: BasiliskRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1940,20 +1881,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: BasiliskRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: BasiliskRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1973,20 +1913,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2005,16 +1944,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2050,14 +1988,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
@@ -2069,14 +2005,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -2086,15 +2023,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claim: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Claim';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2104,19 +2040,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {OrmlVestingVestingSchedule} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         schedule: OrmlVestingVestingSchedule,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { dest: AccountId32Like; schedule: OrmlVestingVestingSchedule };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2126,19 +2061,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<OrmlVestingVestingSchedule>} vestingSchedules
      **/
     updateVestingSchedules: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         vestingSchedules: Array<OrmlVestingVestingSchedule>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'UpdateVestingSchedules';
             params: { who: AccountId32Like; vestingSchedules: Array<OrmlVestingVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2147,23 +2081,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     claimFor: GenericTxCall<
-      Rv,
       (dest: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ClaimFor';
             params: { dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2185,13 +2118,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         forceProxyType: BasiliskRuntimeSystemProxyType | undefined,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2202,7 +2133,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2222,20 +2154,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: BasiliskRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: AccountId32Like; proxyType: BasiliskRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2253,20 +2184,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: BasiliskRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: AccountId32Like; proxyType: BasiliskRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2280,15 +2210,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2317,20 +2246,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: BasiliskRuntimeSystemProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: BasiliskRuntimeSystemProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2359,7 +2287,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: AccountId32Like,
         proxyType: BasiliskRuntimeSystemProxyType,
@@ -2367,7 +2294,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2380,7 +2306,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2405,19 +2332,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2437,19 +2363,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2469,19 +2394,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2504,14 +2428,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         real: AccountId32Like,
         forceProxyType: BasiliskRuntimeSystemProxyType | undefined,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2523,14 +2445,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -2554,16 +2477,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2577,16 +2499,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2602,16 +2523,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2623,15 +2543,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2644,15 +2563,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2665,16 +2583,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2687,16 +2604,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2712,16 +2628,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2738,26 +2653,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2778,19 +2692,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: BasiliskRuntimeOpaqueSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: BasiliskRuntimeOpaqueSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2810,22 +2723,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -2840,16 +2752,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2864,16 +2775,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2886,16 +2796,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2907,16 +2816,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2928,23 +2836,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -2972,19 +2879,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         admin: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: bigint; admin: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3012,20 +2918,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: bigint; owner: AccountId32Like; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3050,19 +2955,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: bigint; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3084,20 +2988,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         owner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: bigint; item: bigint; owner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3123,20 +3026,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         checkOwner: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: bigint; item: bigint; checkOwner: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3164,20 +3066,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: bigint; item: bigint; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3204,19 +3105,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<bigint>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         items: Array<bigint>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: bigint; items: Array<bigint> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3236,19 +3136,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3268,19 +3167,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3298,16 +3196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3325,16 +3222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3355,19 +3251,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         newOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: bigint; newOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3391,21 +3286,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         issuer: AccountId32Like,
         admin: AccountId32Like,
         freezer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetTeam';
             params: { collection: bigint; issuer: AccountId32Like; admin: AccountId32Like; freezer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3430,20 +3324,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         delegate: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: bigint; item: bigint; delegate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3470,20 +3363,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         maybeCheckDelegate: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: bigint; item: bigint; maybeCheckDelegate: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3514,7 +3406,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
@@ -3524,7 +3415,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -3539,7 +3429,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3568,21 +3459,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3607,20 +3497,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3649,21 +3538,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: bigint; item: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3686,19 +3574,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3725,20 +3612,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3759,16 +3645,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3787,16 +3672,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: bigint | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3817,19 +3701,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: bigint; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3852,14 +3735,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         price: bigint | undefined,
         whitelistedBuyer: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -3871,7 +3752,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3891,27 +3773,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: bigint; item: bigint; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -3929,16 +3810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3957,16 +3837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3984,16 +3863,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4009,15 +3887,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4043,19 +3920,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4074,16 +3950,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4100,19 +3975,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4129,19 +4003,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4158,19 +4031,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4197,21 +4069,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: AccountId32Like,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: AccountId32Like; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4232,16 +4103,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4258,19 +4128,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4284,19 +4153,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4312,16 +4180,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4339,15 +4206,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4362,20 +4228,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: AccountId32Like,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: AccountId32Like; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4385,16 +4250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (authority: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { authority: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4414,20 +4278,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetUsernameFor';
             params: { who: AccountId32Like; username: BytesLike; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4438,16 +4301,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4459,16 +4321,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4478,16 +4339,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4498,23 +4358,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeDanglingUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveDanglingUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -4538,19 +4397,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: BasiliskRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4602,7 +4460,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4610,7 +4467,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: BasiliskRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4623,7 +4479,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4666,7 +4523,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4674,7 +4530,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4687,7 +4542,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4720,14 +4576,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4739,14 +4593,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -4760,16 +4615,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4801,13 +4655,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -4818,7 +4670,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4832,19 +4685,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4861,20 +4713,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4884,16 +4735,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4912,26 +4762,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -4952,19 +4801,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4999,14 +4847,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: AccountId32Like,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -5018,7 +4864,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5041,16 +4888,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5069,19 +4915,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5120,19 +4965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5159,27 +5003,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -5201,13 +5044,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: BasiliskRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -5218,7 +5059,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5235,16 +5077,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5260,16 +5101,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5284,16 +5124,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5308,16 +5147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5330,16 +5168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5357,16 +5194,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5382,16 +5218,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5408,26 +5243,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -5438,16 +5272,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5456,16 +5289,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5476,20 +5308,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5498,23 +5329,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: BasiliskRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: BasiliskRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RelayChainInfo`'s transaction calls
@@ -5523,7 +5353,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -5538,14 +5368,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5557,7 +5385,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5568,19 +5397,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5594,7 +5422,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -5602,7 +5429,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5615,7 +5441,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5625,16 +5452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5647,14 +5473,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5666,7 +5490,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5680,7 +5505,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -5688,7 +5512,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: BasiliskRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5701,7 +5524,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: BasiliskRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5724,20 +5548,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5760,20 +5583,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5783,16 +5605,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5802,23 +5623,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -5838,16 +5658,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPrimitivesParachainInherentParachainInherentData} data
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (data: CumulusPrimitivesParachainInherentParachainInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SetValidationData';
             params: { data: CumulusPrimitivesParachainInherentParachainInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5856,23 +5675,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -5881,7 +5699,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -5893,19 +5711,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5935,14 +5752,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5954,7 +5769,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5996,14 +5812,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6015,7 +5829,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6033,19 +5848,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6061,19 +5875,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV4Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV4Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6087,16 +5900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6109,16 +5921,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6133,16 +5944,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6185,7 +5995,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -6193,7 +6002,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6206,7 +6014,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6237,7 +6046,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -6245,7 +6053,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6258,7 +6065,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6271,16 +6079,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6326,7 +6133,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -6334,7 +6140,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6347,7 +6152,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6363,19 +6169,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6438,7 +6243,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -6448,7 +6252,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6463,14 +6266,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -6479,7 +6283,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -6492,19 +6296,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6529,14 +6332,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -6548,14 +6349,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRegistry`'s transaction calls
@@ -6581,7 +6383,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} xcmRateLimit
      **/
     register: GenericTxCall<
-      Rv,
       (
         name: BytesLike,
         assetType: PalletAssetRegistryAssetType,
@@ -6591,7 +6392,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         location: BasiliskRuntimeXcmAssetLocation | undefined,
         xcmRateLimit: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -6606,7 +6406,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               xcmRateLimit: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6624,7 +6425,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} xcmRateLimit
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetId: number,
         name: BytesLike,
@@ -6632,7 +6432,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         existentialDeposit: bigint | undefined,
         xcmRateLimit: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -6645,7 +6444,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               xcmRateLimit: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6663,20 +6463,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         assetId: number,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'SetMetadata';
             params: { assetId: number; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6693,26 +6492,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BasiliskRuntimeXcmAssetLocation} location
      **/
     setLocation: GenericTxCall<
-      Rv,
       (
         assetId: number,
         location: BasiliskRuntimeXcmAssetLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'SetLocation';
             params: { assetId: number; location: BasiliskRuntimeXcmAssetLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYK`'s transaction calls
@@ -6735,21 +6533,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountB
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         assetA: number,
         amountA: bigint,
         assetB: number,
         amountB: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'CreatePool';
             params: { assetA: number; amountA: bigint; assetB: number; amountB: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6766,21 +6563,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountBMaxLimit
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         amountA: bigint,
         amountBMaxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'AddLiquidity';
             params: { assetA: number; assetB: number; amountA: bigint; amountBMaxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6797,20 +6593,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} liquidityAmount
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         liquidityAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { assetA: number; assetB: number; liquidityAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6831,7 +6626,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -6839,14 +6633,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6866,7 +6660,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
@@ -6874,21 +6667,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Duster`'s transaction calls
@@ -6905,19 +6698,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currencyId
      **/
     dustAccount: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         currencyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'DustAccount';
             params: { account: AccountId32Like; currencyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6929,16 +6721,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     addNondustableAccount: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'AddNondustableAccount';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6948,23 +6739,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     removeNondustableAccount: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'RemoveNondustableAccount';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `LBP`'s transaction calls
@@ -7018,7 +6808,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} repayTarget
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         poolOwner: AccountId32Like,
         assetA: number,
@@ -7032,7 +6821,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like,
         repayTarget: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -7051,7 +6839,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7086,7 +6875,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} repayTarget
      **/
     updatePoolData: GenericTxCall<
-      Rv,
       (
         poolId: AccountId32Like,
         poolOwner: AccountId32Like | undefined,
@@ -7098,7 +6886,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like | undefined,
         repayTarget: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -7115,7 +6902,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7137,19 +6925,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, bigint]} amountB
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         amountA: [number, bigint],
         amountB: [number, bigint],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'AddLiquidity';
             params: { amountA: [number, bigint]; amountB: [number, bigint] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7169,16 +6956,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} poolId
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (poolId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { poolId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7205,21 +6991,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7246,28 +7031,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NFT`'s transaction calls
@@ -7292,20 +7076,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     createCollection: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         collectionType: PalletNftCollectionType,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nft';
           palletCall: {
             name: 'CreateCollection';
             params: { collectionId: bigint; collectionType: PalletNftCollectionType; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7325,20 +7108,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nft';
           palletCall: {
             name: 'Mint';
             params: { collectionId: bigint; itemId: bigint; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7357,20 +7139,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nft';
           palletCall: {
             name: 'Transfer';
             params: { collectionId: bigint; itemId: bigint; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7387,19 +7168,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} itemId
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nft';
           palletCall: {
             name: 'Burn';
             params: { collectionId: bigint; itemId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7416,23 +7196,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collectionId
      **/
     destroyCollection: GenericTxCall<
-      Rv,
       (collectionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nft';
           palletCall: {
             name: 'DestroyCollection';
             params: { collectionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Marketplace`'s transaction calls
@@ -7451,19 +7230,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} itemId
      **/
     buy: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'Buy';
             params: { collectionId: bigint; itemId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7481,20 +7259,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} newPrice
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         newPrice: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'SetPrice';
             params: { collectionId: bigint; itemId: bigint; newPrice: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7515,21 +7292,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} expires
      **/
     makeOffer: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         amount: bigint,
         expires: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'MakeOffer';
             params: { collectionId: bigint; itemId: bigint; amount: bigint; expires: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7548,20 +7324,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} maker
      **/
     withdrawOffer: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         maker: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'WithdrawOffer';
             params: { collectionId: bigint; itemId: bigint; maker: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7578,20 +7353,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} maker
      **/
     acceptOffer: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         maker: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'AcceptOffer';
             params: { collectionId: bigint; itemId: bigint; maker: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7611,28 +7385,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} royalty
      **/
     addRoyalty: GenericTxCall<
-      Rv,
       (
         collectionId: bigint,
         itemId: bigint,
         author: AccountId32Like,
         royalty: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Marketplace';
           palletCall: {
             name: 'AddRoyalty';
             params: { collectionId: bigint; itemId: bigint; author: AccountId32Like; royalty: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TransactionPause`'s transaction calls
@@ -7644,19 +7417,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     pauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'PauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7666,26 +7438,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     unpauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'UnpauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Router`'s transaction calls
@@ -7713,7 +7484,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7721,7 +7491,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7734,7 +7503,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7760,7 +7530,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7768,7 +7537,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxAmountIn: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7781,7 +7549,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7812,19 +7581,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     setRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SetRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7848,19 +7616,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     forceInsertRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'ForceInsertRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7886,28 +7653,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sellAll: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SellAll';
             params: { assetIn: number; assetOut: number; minAmountOut: bigint; route: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKLiquidityMining`'s transaction calls
@@ -7953,7 +7719,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     createGlobalFarm: GenericTxCall<
-      Rv,
       (
         totalRewards: bigint,
         plannedYieldingPeriods: number,
@@ -7965,7 +7730,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minDeposit: bigint,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -7982,7 +7746,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               priceAdjustment: FixedU128;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8002,19 +7767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     updateGlobalFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateGlobalFarm';
             params: { globalFarmId: number; priceAdjustment: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8034,16 +7798,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} globalFarmId
      **/
     terminateGlobalFarm: GenericTxCall<
-      Rv,
       (globalFarmId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateGlobalFarm';
             params: { globalFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8073,14 +7836,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletLiquidityMiningLoyaltyCurve | undefined} loyaltyCurve
      **/
     createYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
         loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -8092,7 +7853,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8114,20 +7876,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     updateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8152,19 +7913,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     stopYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'StopYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8193,21 +7953,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     resumeYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ResumeYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8237,20 +7996,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     terminateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8276,21 +8034,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} sharesAmount
      **/
     depositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         sharesAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'DepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; sharesAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8317,21 +8074,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} depositId
      **/
     redepositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         depositId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'RedepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; depositId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8352,19 +8108,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     claimRewards: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ClaimRewards';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8397,27 +8152,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     withdrawShares: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'WithdrawShares';
             params: { depositId: bigint; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKWarehouseLM`'s transaction calls
@@ -8426,7 +8180,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Broadcast`'s transaction calls
@@ -8435,7 +8189,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EmaOracle`'s transaction calls
@@ -8447,19 +8201,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     addOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'AddOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8469,26 +8222,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     removeOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'RemoveOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Currencies`'s transaction calls
@@ -8505,20 +8257,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8532,19 +8283,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferNativeCurrency: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'TransferNativeCurrency';
             params: { dest: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8558,27 +8308,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     updateBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'UpdateBalance';
             params: { who: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Tokens`'s transaction calls
@@ -8604,20 +8353,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8647,20 +8395,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; currencyId: number; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8682,20 +8429,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8716,21 +8462,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8750,28 +8495,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newReserved
      **/
     setBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         newFree: bigint,
         newReserved: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'SetBalance';
             params: { who: AccountId32Like; currencyId: number; newFree: bigint; newReserved: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OrmlXcm`'s transaction calls
@@ -8784,26 +8528,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendAsSovereign: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OrmlXcm';
           palletCall: {
             name: 'SendAsSovereign';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XTokens`'s transaction calls
@@ -8829,14 +8572,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -8848,7 +8589,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8871,20 +8613,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiasset: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
             name: 'TransferMultiasset';
             params: { asset: XcmVersionedAsset; dest: XcmVersionedLocation; destWeightLimit: XcmV3WeightLimit };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8918,7 +8659,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferWithFee: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
@@ -8926,7 +8666,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -8939,7 +8678,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8972,14 +8712,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassetWithFee: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         fee: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -8991,7 +8729,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9018,14 +8757,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMulticurrencies: GenericTxCall<
-      Rv,
       (
         currencies: Array<[number, bigint]>,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -9037,7 +8774,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9064,14 +8802,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -9083,13 +8819,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/basilisk/view-functions.d.ts b/packages/chaintypes/src/basilisk/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/basilisk/view-functions.d.ts
+++ b/packages/chaintypes/src/basilisk/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/hydration/consts.d.ts b/packages/chaintypes/src/hydration/consts.d.ts
index ecbd56d1..ab9b65e0 100644
--- a/packages/chaintypes/src/hydration/consts.d.ts
+++ b/packages/chaintypes/src/hydration/consts.d.ts
@@ -1,7 +1,7 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
-import type { RuntimeVersion, Permill, AccountId32, FixedBytes, Perbill, FixedU128, Percent } from 'dedot/codecs';
+import type { GenericChainConsts } from 'dedot/types';
+import type { RuntimeVersion, Permill, AccountId32, FixedBytes, Perbill, FixedU128, H160, Percent } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
   FrameSystemLimitsBlockLength,
@@ -16,7 +16,7 @@ import type {
   StagingXcmV4Location,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
@@ -768,17 +768,7 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
    **/
   duster: {
     /**
-     * Reward amount
-     **/
-    reward: bigint;
-
-    /**
-     * Native Asset Id
-     **/
-    nativeCurrencyId: number;
-
-    /**
-     * Default account for `reward_account` and `dust_account` in genesis config.
+     * Treasury account, which receives the dust.
      **/
     treasuryAccountId: AccountId32;
 
@@ -1234,6 +1224,8 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
      * Pallet ID to determine HSM account
      **/
     palletId: FrameSupportPalletId;
+    minArbitrageAmount: bigint;
+    flashLoanReceiver: H160;
 
     /**
      * The gas limit for the execution of EVM calls
@@ -1739,6 +1731,47 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
      **/
     [name: string]: any;
   };
+  /**
+   * Pallet `Ismp`'s constants
+   **/
+  ismp: {
+    /**
+     * Generic pallet constant
+     **/
+    [name: string]: any;
+  };
+  /**
+   * Pallet `IsmpParachain`'s constants
+   **/
+  ismpParachain: {
+    /**
+     * Generic pallet constant
+     **/
+    [name: string]: any;
+  };
+  /**
+   * Pallet `Hyperbridge`'s constants
+   **/
+  hyperbridge: {
+    /**
+     * Generic pallet constant
+     **/
+    [name: string]: any;
+  };
+  /**
+   * Pallet `TokenGateway`'s constants
+   **/
+  tokenGateway: {
+    /**
+     * The decimals of the native currency
+     **/
+    decimals: number;
+
+    /**
+     * Generic pallet constant
+     **/
+    [name: string]: any;
+  };
   /**
    * Pallet `EmaOracle`'s constants
    **/
diff --git a/packages/chaintypes/src/hydration/errors.d.ts b/packages/chaintypes/src/hydration/errors.d.ts
index 1c48ad7f..fd6f71ea 100644
--- a/packages/chaintypes/src/hydration/errors.d.ts
+++ b/packages/chaintypes/src/hydration/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -68,67 +68,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiTransactionPayment`'s errors
@@ -137,67 +137,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Selected currency is not supported.
      **/
-    UnsupportedCurrency: GenericPalletError<Rv>;
+    UnsupportedCurrency: GenericPalletError;
 
     /**
      * Account balance should be non-zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Currency is already in the list of accepted currencies.
      **/
-    AlreadyAccepted: GenericPalletError<Rv>;
+    AlreadyAccepted: GenericPalletError;
 
     /**
      * It is not allowed to add Core Asset as accepted currency. Core asset is accepted by design.
      **/
-    CoreAssetNotAllowed: GenericPalletError<Rv>;
+    CoreAssetNotAllowed: GenericPalletError;
 
     /**
      * Fallback price cannot be zero.
      **/
-    ZeroPrice: GenericPalletError<Rv>;
+    ZeroPrice: GenericPalletError;
 
     /**
      * Fallback price was not found.
      **/
-    FallbackPriceNotFound: GenericPalletError<Rv>;
+    FallbackPriceNotFound: GenericPalletError;
 
     /**
      * Math overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * It is not allowed to change payment currency of an EVM account.
      **/
-    EvmAccountNotAllowed: GenericPalletError<Rv>;
+    EvmAccountNotAllowed: GenericPalletError;
 
     /**
      * EVM permit expired.
      **/
-    EvmPermitExpired: GenericPalletError<Rv>;
+    EvmPermitExpired: GenericPalletError;
 
     /**
      * EVM permit is invalid.
      **/
-    EvmPermitInvalid: GenericPalletError<Rv>;
+    EvmPermitInvalid: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitCallExecutionError: GenericPalletError<Rv>;
+    EvmPermitCallExecutionError: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitRunnerError: GenericPalletError<Rv>;
+    EvmPermitRunnerError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -206,63 +206,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -271,12 +271,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -285,47 +285,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -334,137 +334,137 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Democracy`'s errors
@@ -473,128 +473,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Value too low
      **/
-    ValueLow: GenericPalletError<Rv>;
+    ValueLow: GenericPalletError;
 
     /**
      * Proposal does not exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Cannot cancel the same proposal twice
      **/
-    AlreadyCanceled: GenericPalletError<Rv>;
+    AlreadyCanceled: GenericPalletError;
 
     /**
      * Proposal already made
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal still blacklisted
      **/
-    ProposalBlacklisted: GenericPalletError<Rv>;
+    ProposalBlacklisted: GenericPalletError;
 
     /**
      * Next external proposal not simple majority
      **/
-    NotSimpleMajority: GenericPalletError<Rv>;
+    NotSimpleMajority: GenericPalletError;
 
     /**
      * Invalid hash
      **/
-    InvalidHash: GenericPalletError<Rv>;
+    InvalidHash: GenericPalletError;
 
     /**
      * No external proposal
      **/
-    NoProposal: GenericPalletError<Rv>;
+    NoProposal: GenericPalletError;
 
     /**
      * Identity may not veto a proposal twice
      **/
-    AlreadyVetoed: GenericPalletError<Rv>;
+    AlreadyVetoed: GenericPalletError;
 
     /**
      * Vote given for invalid referendum
      **/
-    ReferendumInvalid: GenericPalletError<Rv>;
+    ReferendumInvalid: GenericPalletError;
 
     /**
      * No proposals waiting
      **/
-    NoneWaiting: GenericPalletError<Rv>;
+    NoneWaiting: GenericPalletError;
 
     /**
      * The given account did not vote on the referendum.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed, either through `unvote` or `reap_vote`.
      **/
-    VotesExist: GenericPalletError<Rv>;
+    VotesExist: GenericPalletError;
 
     /**
      * The instant referendum origin is currently disallowed.
      **/
-    InstantNotAllowed: GenericPalletError<Rv>;
+    InstantNotAllowed: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Invalid upper bound.
      **/
-    WrongUpperBound: GenericPalletError<Rv>;
+    WrongUpperBound: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Maximum number of items reached.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Voting period too low
      **/
-    VotingPeriodLow: GenericPalletError<Rv>;
+    VotingPeriodLow: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommittee`'s errors
@@ -603,62 +603,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -667,47 +667,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -716,77 +716,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -795,97 +795,97 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -894,7 +894,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -905,32 +905,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -939,68 +939,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1009,77 +1009,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -1088,32 +1088,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Dispatcher`'s errors
@@ -1123,17 +1123,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The EVM call execution failed. This happens when the EVM returns an exit reason
      * other than `ExitSucceed(Returned)` or `ExitSucceed(Stopped)`.
      **/
-    EvmCallFailed: GenericPalletError<Rv>;
+    EvmCallFailed: GenericPalletError;
 
     /**
      * The provided call is not an EVM call. This extrinsic only accepts `pallet_evm::Call::call`.
      **/
-    NotEvmCall: GenericPalletError<Rv>;
+    NotEvmCall: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRegistry`'s errors
@@ -1142,82 +1142,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID is not available. This only happens when it reaches the MAX value of given id type.
      **/
-    NoIdAvailable: GenericPalletError<Rv>;
+    NoIdAvailable: GenericPalletError;
 
     /**
      * Invalid asset name or symbol.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Length of name or symbol is less than min. length.
      **/
-    TooShort: GenericPalletError<Rv>;
+    TooShort: GenericPalletError;
 
     /**
      * Asset's symbol can't contain whitespace characters .
      **/
-    InvalidSymbol: GenericPalletError<Rv>;
+    InvalidSymbol: GenericPalletError;
 
     /**
      * Asset ID is not registered in the asset-registry.
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Asset is already registered.
      **/
-    AssetAlreadyRegistered: GenericPalletError<Rv>;
+    AssetAlreadyRegistered: GenericPalletError;
 
     /**
      * Incorrect number of assets provided to create shared asset.
      **/
-    InvalidSharedAssetLen: GenericPalletError<Rv>;
+    InvalidSharedAssetLen: GenericPalletError;
 
     /**
      * Cannot update asset location.
      **/
-    CannotUpdateLocation: GenericPalletError<Rv>;
+    CannotUpdateLocation: GenericPalletError;
 
     /**
      * Selected asset id is out of reserved range.
      **/
-    NotInReservedRange: GenericPalletError<Rv>;
+    NotInReservedRange: GenericPalletError;
 
     /**
      * Location already registered with different asset.
      **/
-    LocationAlreadyRegistered: GenericPalletError<Rv>;
+    LocationAlreadyRegistered: GenericPalletError;
 
     /**
      * Origin is forbidden to set/update value.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Balance too low.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Sufficient assets can't be changed to insufficient.
      **/
-    ForbiddenSufficiencyChange: GenericPalletError<Rv>;
+    ForbiddenSufficiencyChange: GenericPalletError;
 
     /**
      * Asset is already banned.
      **/
-    AssetAlreadyBanned: GenericPalletError<Rv>;
+    AssetAlreadyBanned: GenericPalletError;
 
     /**
      * Asset is not banned.
      **/
-    AssetNotBanned: GenericPalletError<Rv>;
+    AssetNotBanned: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -1226,22 +1226,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Ethereum signature is not valid
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Claim is not valid
      **/
-    NoClaimOrAlreadyClaimed: GenericPalletError<Rv>;
+    NoClaimOrAlreadyClaimed: GenericPalletError;
 
     /**
      * Value reached maximum and cannot be incremented further
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorRewards`'s errors
@@ -1250,7 +1250,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Omnipool`'s errors
@@ -1259,167 +1259,167 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Balance too low
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Asset is already in omnipool
      **/
-    AssetAlreadyAdded: GenericPalletError<Rv>;
+    AssetAlreadyAdded: GenericPalletError;
 
     /**
      * Asset is not in omnipool
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Failed to add token to Omnipool due to insufficient initial liquidity.
      **/
-    MissingBalance: GenericPalletError<Rv>;
+    MissingBalance: GenericPalletError;
 
     /**
      * Invalid initial asset price.
      **/
-    InvalidInitialAssetPrice: GenericPalletError<Rv>;
+    InvalidInitialAssetPrice: GenericPalletError;
 
     /**
      * Slippage protection - minimum limit has not been reached.
      **/
-    BuyLimitNotReached: GenericPalletError<Rv>;
+    BuyLimitNotReached: GenericPalletError;
 
     /**
      * Slippage protection - maximum limit has been exceeded.
      **/
-    SellLimitExceeded: GenericPalletError<Rv>;
+    SellLimitExceeded: GenericPalletError;
 
     /**
      * Position has not been found.
      **/
-    PositionNotFound: GenericPalletError<Rv>;
+    PositionNotFound: GenericPalletError;
 
     /**
      * Insufficient shares in position
      **/
-    InsufficientShares: GenericPalletError<Rv>;
+    InsufficientShares: GenericPalletError;
 
     /**
      * Asset is not allowed to be traded.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Signed account is not owner of position instance.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Asset weight cap has been exceeded.
      **/
-    AssetWeightCapExceeded: GenericPalletError<Rv>;
+    AssetWeightCapExceeded: GenericPalletError;
 
     /**
      * Asset is not registered in asset registry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Provided liquidity is below minimum allowed limit
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Traded amount is below minimum allowed limit
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Sell or buy with same asset ids is not allowed.
      **/
-    SameAssetTradeNotAllowed: GenericPalletError<Rv>;
+    SameAssetTradeNotAllowed: GenericPalletError;
 
     /**
      * LRNA update after trade results in positive value.
      **/
-    HubAssetUpdateError: GenericPalletError<Rv>;
+    HubAssetUpdateError: GenericPalletError;
 
     /**
      * Amount of shares provided cannot be 0.
      **/
-    InvalidSharesAmount: GenericPalletError<Rv>;
+    InvalidSharesAmount: GenericPalletError;
 
     /**
      * Hub asset is only allowed to be sold.
      **/
-    InvalidHubAssetTradableState: GenericPalletError<Rv>;
+    InvalidHubAssetTradableState: GenericPalletError;
 
     /**
      * Asset is not allowed to be refunded.
      **/
-    AssetRefundNotAllowed: GenericPalletError<Rv>;
+    AssetRefundNotAllowed: GenericPalletError;
 
     /**
      * Max fraction of asset to buy has been exceeded.
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Max fraction of asset to sell has been exceeded.
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Max allowed price difference has been exceeded.
      **/
-    PriceDifferenceTooHigh: GenericPalletError<Rv>;
+    PriceDifferenceTooHigh: GenericPalletError;
 
     /**
      * Invalid oracle price - division by zero.
      **/
-    InvalidOraclePrice: GenericPalletError<Rv>;
+    InvalidOraclePrice: GenericPalletError;
 
     /**
      * Failed to calculate withdrawal fee.
      **/
-    InvalidWithdrawalFee: GenericPalletError<Rv>;
+    InvalidWithdrawalFee: GenericPalletError;
 
     /**
      * More than allowed amount of fee has been transferred.
      **/
-    FeeOverdraft: GenericPalletError<Rv>;
+    FeeOverdraft: GenericPalletError;
 
     /**
      * Token cannot be removed from Omnipool due to shares still owned by other users.
      **/
-    SharesRemaining: GenericPalletError<Rv>;
+    SharesRemaining: GenericPalletError;
 
     /**
      * Token cannot be removed from Omnipool because asset is not frozen.
      **/
-    AssetNotFrozen: GenericPalletError<Rv>;
+    AssetNotFrozen: GenericPalletError;
 
     /**
      * Calculated amount out from sell trade is zero.
      **/
-    ZeroAmountOut: GenericPalletError<Rv>;
+    ZeroAmountOut: GenericPalletError;
 
     /**
      * Existential deposit of asset is not available.
      **/
-    ExistentialDepositNotAvailable: GenericPalletError<Rv>;
+    ExistentialDepositNotAvailable: GenericPalletError;
 
     /**
      * Slippage protection
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Extra protocol fee has not been consumed.
      **/
-    ProtocolFeeNotConsumed: GenericPalletError<Rv>;
+    ProtocolFeeNotConsumed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TransactionPause`'s errors
@@ -1428,22 +1428,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * can not pause
      **/
-    CannotPause: GenericPalletError<Rv>;
+    CannotPause: GenericPalletError;
 
     /**
      * invalid character encoding
      **/
-    InvalidCharacter: GenericPalletError<Rv>;
+    InvalidCharacter: GenericPalletError;
 
     /**
      * pallet name or function name is too long
      **/
-    NameTooLong: GenericPalletError<Rv>;
+    NameTooLong: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Duster`'s errors
@@ -1452,37 +1452,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is excluded from dusting.
      **/
-    AccountBlacklisted: GenericPalletError<Rv>;
+    AccountWhitelisted: GenericPalletError;
 
     /**
      * Account is not present in the non-dustable list.
      **/
-    AccountNotBlacklisted: GenericPalletError<Rv>;
+    AccountNotWhitelisted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
-     * The balance is sufficient to keep account open.
+     * The balance was not fully dusted, there is some leftover on the account. Normally, it should never happen.
      **/
-    BalanceSufficient: GenericPalletError<Rv>;
+    NonZeroBalance: GenericPalletError;
 
     /**
-     * Dust account is not set.
+     * The balance is sufficient to keep account open.
      **/
-    DustAccountNotSet: GenericPalletError<Rv>;
+    BalanceSufficient: GenericPalletError;
 
     /**
      * Reserve account is not set.
      **/
-    ReserveAccountNotSet: GenericPalletError<Rv>;
+    ReserveAccountNotSet: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s errors
@@ -1491,154 +1491,154 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Global farm does not exist.
      **/
-    GlobalFarmNotFound: GenericPalletError<Rv>;
+    GlobalFarmNotFound: GenericPalletError;
 
     /**
      * Yield farm does not exist.
      **/
-    YieldFarmNotFound: GenericPalletError<Rv>;
+    YieldFarmNotFound: GenericPalletError;
 
     /**
      * Multiple claims in the same period is not allowed.
      **/
-    DoubleClaimInPeriod: GenericPalletError<Rv>;
+    DoubleClaimInPeriod: GenericPalletError;
 
     /**
      * Liquidity mining is canceled.
      **/
-    LiquidityMiningCanceled: GenericPalletError<Rv>;
+    LiquidityMiningCanceled: GenericPalletError;
 
     /**
      * Liquidity mining is not canceled.
      **/
-    LiquidityMiningIsActive: GenericPalletError<Rv>;
+    LiquidityMiningIsActive: GenericPalletError;
 
     /**
      * Liquidity mining is in `active` or `terminated` state and action cannot be completed.
      **/
-    LiquidityMiningIsNotStopped: GenericPalletError<Rv>;
+    LiquidityMiningIsNotStopped: GenericPalletError;
 
     /**
      * Account is not allowed to perform action.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Yield farm multiplier can't be 0.
      **/
-    InvalidMultiplier: GenericPalletError<Rv>;
+    InvalidMultiplier: GenericPalletError;
 
     /**
      * Yield farm with given `amm_pool_id` already exists in global farm.
      **/
-    YieldFarmAlreadyExists: GenericPalletError<Rv>;
+    YieldFarmAlreadyExists: GenericPalletError;
 
     /**
      * Loyalty curve's initial reward percentage is not valid. Valid range is: [0, 1).
      **/
-    InvalidInitialRewardPercentage: GenericPalletError<Rv>;
+    InvalidInitialRewardPercentage: GenericPalletError;
 
     /**
      * One or more yield farms exist in global farm.
      **/
-    GlobalFarmIsNotEmpty: GenericPalletError<Rv>;
+    GlobalFarmIsNotEmpty: GenericPalletError;
 
     /**
      * Farm's `incentivized_asset` is missing in provided asset pair.
      **/
-    MissingIncentivizedAsset: GenericPalletError<Rv>;
+    MissingIncentivizedAsset: GenericPalletError;
 
     /**
      * Reward currency balance is not sufficient.
      **/
-    InsufficientRewardCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientRewardCurrencyBalance: GenericPalletError;
 
     /**
      * Blocks per period can't be 0.
      **/
-    InvalidBlocksPerPeriod: GenericPalletError<Rv>;
+    InvalidBlocksPerPeriod: GenericPalletError;
 
     /**
      * Yield per period can't be 0.
      **/
-    InvalidYieldPerPeriod: GenericPalletError<Rv>;
+    InvalidYieldPerPeriod: GenericPalletError;
 
     /**
      * Total rewards is less than `MinTotalFarmRewards`.
      **/
-    InvalidTotalRewards: GenericPalletError<Rv>;
+    InvalidTotalRewards: GenericPalletError;
 
     /**
      * Planned yielding periods is less than `MinPlannedYieldingPeriods`.
      **/
-    InvalidPlannedYieldingPeriods: GenericPalletError<Rv>;
+    InvalidPlannedYieldingPeriods: GenericPalletError;
 
     /**
      * Maximum number of locks reached for deposit.
      **/
-    MaxEntriesPerDeposit: GenericPalletError<Rv>;
+    MaxEntriesPerDeposit: GenericPalletError;
 
     /**
      * Trying to lock LP shares into already locked yield farm.
      **/
-    DoubleLock: GenericPalletError<Rv>;
+    DoubleLock: GenericPalletError;
 
     /**
      * Yield farm entry doesn't exist for given deposit.
      **/
-    YieldFarmEntryNotFound: GenericPalletError<Rv>;
+    YieldFarmEntryNotFound: GenericPalletError;
 
     /**
      * Max number of yield farms in global farm was reached. Global farm can't accept new
      * yield farms until some yield farm is not removed from storage.
      **/
-    GlobalFarmIsFull: GenericPalletError<Rv>;
+    GlobalFarmIsFull: GenericPalletError;
 
     /**
      * Invalid min. deposit was set for global farm.
      **/
-    InvalidMinDeposit: GenericPalletError<Rv>;
+    InvalidMinDeposit: GenericPalletError;
 
     /**
      * Price adjustment multiplier can't be 0.
      **/
-    InvalidPriceAdjustment: GenericPalletError<Rv>;
+    InvalidPriceAdjustment: GenericPalletError;
 
     /**
      * Account creation from id failed.
      **/
-    ErrorGetAccountId: GenericPalletError<Rv>;
+    ErrorGetAccountId: GenericPalletError;
 
     /**
      * Value of deposited shares amount in reward currency is bellow min. limit.
      **/
-    IncorrectValuedShares: GenericPalletError<Rv>;
+    IncorrectValuedShares: GenericPalletError;
 
     /**
      * `reward_currency` is not registered in asset registry.
      **/
-    RewardCurrencyNotRegistered: GenericPalletError<Rv>;
+    RewardCurrencyNotRegistered: GenericPalletError;
 
     /**
      * `incentivized_asset` is not registered in asset registry.
      **/
-    IncentivizedAssetNotRegistered: GenericPalletError<Rv>;
+    IncentivizedAssetNotRegistered: GenericPalletError;
 
     /**
      * Provided `amm_pool_id` doesn't match deposit's `amm_pool_id`.
      **/
-    AmmPoolIdMismatch: GenericPalletError<Rv>;
+    AmmPoolIdMismatch: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s errors
@@ -1647,43 +1647,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset is not in the omnipool.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Signed account is not owner of the deposit.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Rewards to claim are 0.
      **/
-    ZeroClaimedRewards: GenericPalletError<Rv>;
+    ZeroClaimedRewards: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Oracle could not be found for requested assets.
      **/
-    OracleNotAvailable: GenericPalletError<Rv>;
+    OracleNotAvailable: GenericPalletError;
 
     /**
      * Oracle providing `price_adjustment` could not be found for requested assets.
      **/
-    PriceAdjustmentNotAvailable: GenericPalletError<Rv>;
+    PriceAdjustmentNotAvailable: GenericPalletError;
 
     /**
      * No farms specified to join
      **/
-    NoFarmEntriesSpecified: GenericPalletError<Rv>;
+    NoFarmEntriesSpecified: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OTC`'s errors
@@ -1692,49 +1692,49 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset does not exist in registry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Order cannot be found
      **/
-    OrderNotFound: GenericPalletError<Rv>;
+    OrderNotFound: GenericPalletError;
 
     /**
      * Size of order ID exceeds the bound
      **/
-    OrderIdOutOfBound: GenericPalletError<Rv>;
+    OrderIdOutOfBound: GenericPalletError;
 
     /**
      * Cannot partially fill an order which is not partially fillable
      **/
-    OrderNotPartiallyFillable: GenericPalletError<Rv>;
+    OrderNotPartiallyFillable: GenericPalletError;
 
     /**
      * Order amount_in and amount_out must at all times be greater than the existential deposit
      * for the asset multiplied by the ExistentialDepositMultiplier.
      * A fill order may not leave behind amounts smaller than this.
      **/
-    OrderAmountTooSmall: GenericPalletError<Rv>;
+    OrderAmountTooSmall: GenericPalletError;
 
     /**
      * Error with math calculations
      **/
-    MathError: GenericPalletError<Rv>;
+    MathError: GenericPalletError;
 
     /**
      * The caller does not have permission to complete the action
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Reserved amount not sufficient.
      **/
-    InsufficientReservedAmount: GenericPalletError<Rv>;
+    InsufficientReservedAmount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CircuitBreaker`'s errors
@@ -1743,54 +1743,54 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid value for a limit. Limit must be non-zero.
      **/
-    InvalidLimitValue: GenericPalletError<Rv>;
+    InvalidLimitValue: GenericPalletError;
 
     /**
      * Allowed liquidity limit is not stored for asset
      **/
-    LiquidityLimitNotStoredForAsset: GenericPalletError<Rv>;
+    LiquidityLimitNotStoredForAsset: GenericPalletError;
 
     /**
      * Token trade outflow per block has been reached
      **/
-    TokenOutflowLimitReached: GenericPalletError<Rv>;
+    TokenOutflowLimitReached: GenericPalletError;
 
     /**
      * Token trade influx per block has been reached
      **/
-    TokenInfluxLimitReached: GenericPalletError<Rv>;
+    TokenInfluxLimitReached: GenericPalletError;
 
     /**
      * Maximum pool's liquidity limit per block has been reached
      **/
-    MaxLiquidityLimitPerBlockReached: GenericPalletError<Rv>;
+    MaxLiquidityLimitPerBlockReached: GenericPalletError;
 
     /**
      * Asset is not allowed to have a limit
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Asset still in lockdown as it reached the allowed deposit limit for the period
      * Query the `asset_lockdown_state` storage to determine until which block the asset is locked,
      * so that the deposit can be released afterward.
      **/
-    AssetInLockdown: GenericPalletError<Rv>;
+    AssetInLockdown: GenericPalletError;
 
     /**
      * Asset is not in a lockdown
      **/
-    AssetNotInLockdown: GenericPalletError<Rv>;
+    AssetNotInLockdown: GenericPalletError;
 
     /**
      * Invalid amount to save deposit
      **/
-    InvalidAmount: GenericPalletError<Rv>;
+    InvalidAmount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Router`'s errors
@@ -1799,57 +1799,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The trading limit has been reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * The the max number of trades limit is reached
      **/
-    MaxTradesExceeded: GenericPalletError<Rv>;
+    MaxTradesExceeded: GenericPalletError;
 
     /**
      * The AMM pool is not supported for executing trades
      **/
-    PoolNotSupported: GenericPalletError<Rv>;
+    PoolNotSupported: GenericPalletError;
 
     /**
      * The user has not enough balance to execute the trade
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * The calculation of route trade amounts failed in the underlying AMM
      **/
-    RouteCalculationFailed: GenericPalletError<Rv>;
+    RouteCalculationFailed: GenericPalletError;
 
     /**
      * The route is invalid
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * The route update was not successful
      **/
-    RouteUpdateIsNotSuccessful: GenericPalletError<Rv>;
+    RouteUpdateIsNotSuccessful: GenericPalletError;
 
     /**
      * Route contains assets that has no oracle data
      **/
-    RouteHasNoOracle: GenericPalletError<Rv>;
+    RouteHasNoOracle: GenericPalletError;
 
     /**
      * The route execution failed in the underlying AMM
      **/
-    InvalidRouteExecution: GenericPalletError<Rv>;
+    InvalidRouteExecution: GenericPalletError;
 
     /**
      * Trading same assets is not allowed.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DynamicFees`'s errors
@@ -1858,12 +1858,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid fee parameters provided
      **/
-    InvalidFeeParameters: GenericPalletError<Rv>;
+    InvalidFeeParameters: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -1872,73 +1872,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Balance is too low.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Staked amount is too low.
      **/
-    InsufficientStake: GenericPalletError<Rv>;
+    InsufficientStake: GenericPalletError;
 
     /**
      * Staking position has not been found.
      **/
-    PositionNotFound: GenericPalletError<Rv>;
+    PositionNotFound: GenericPalletError;
 
     /**
      * Maximum amount of votes were reached for staking position.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Staking is not initialized.
      **/
-    NotInitialized: GenericPalletError<Rv>;
+    NotInitialized: GenericPalletError;
 
     /**
      * Staking is already initialized.
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * Arithmetic error.
      **/
-    Arithmetic: GenericPalletError<Rv>;
+    Arithmetic: GenericPalletError;
 
     /**
      * Pot's balance is zero.
      **/
-    MissingPotBalance: GenericPalletError<Rv>;
+    MissingPotBalance: GenericPalletError;
 
     /**
      * Account's position already exists.
      **/
-    PositionAlreadyExists: GenericPalletError<Rv>;
+    PositionAlreadyExists: GenericPalletError;
 
     /**
      * Signer is not an owner of the staking position.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Position contains registered votes.
      **/
-    ExistingVotes: GenericPalletError<Rv>;
+    ExistingVotes: GenericPalletError;
 
     /**
      * Position contains processed votes. Removed these votes first before increasing stake or claiming.
      **/
-    ExistingProcessedVotes: GenericPalletError<Rv>;
+    ExistingProcessedVotes: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Stableswap`'s errors
@@ -1947,147 +1947,147 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Creating a pool with same assets or less than 2 assets is not allowed.
      **/
-    IncorrectAssets: GenericPalletError<Rv>;
+    IncorrectAssets: GenericPalletError;
 
     /**
      * Maximum number of assets has been exceeded.
      **/
-    MaxAssetsExceeded: GenericPalletError<Rv>;
+    MaxAssetsExceeded: GenericPalletError;
 
     /**
      * A pool with given assets does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * A pool with given assets already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Asset is not in the pool.
      **/
-    AssetNotInPool: GenericPalletError<Rv>;
+    AssetNotInPool: GenericPalletError;
 
     /**
      * Share asset is not registered in Registry.
      **/
-    ShareAssetNotRegistered: GenericPalletError<Rv>;
+    ShareAssetNotRegistered: GenericPalletError;
 
     /**
      * Share asset is amount assets when creating a pool.
      **/
-    ShareAssetInPoolAssets: GenericPalletError<Rv>;
+    ShareAssetInPoolAssets: GenericPalletError;
 
     /**
      * One or more assets are not registered in AssetRegistry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Invalid asset amount provided. Amount must be greater than zero.
      **/
-    InvalidAssetAmount: GenericPalletError<Rv>;
+    InvalidAssetAmount: GenericPalletError;
 
     /**
      * Balance of an asset is not sufficient to perform a trade.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Balance of a share asset is not sufficient to withdraw liquidity.
      **/
-    InsufficientShares: GenericPalletError<Rv>;
+    InsufficientShares: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Insufficient liquidity left in the pool after withdrawal.
      **/
-    InsufficientLiquidityRemaining: GenericPalletError<Rv>;
+    InsufficientLiquidityRemaining: GenericPalletError;
 
     /**
      * Amount is less than the minimum trading amount configured.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Minimum limit has not been reached during trade.
      **/
-    BuyLimitNotReached: GenericPalletError<Rv>;
+    BuyLimitNotReached: GenericPalletError;
 
     /**
      * Maximum limit has been exceeded during trade.
      **/
-    SellLimitExceeded: GenericPalletError<Rv>;
+    SellLimitExceeded: GenericPalletError;
 
     /**
      * Initial liquidity of asset must be > 0.
      **/
-    InvalidInitialLiquidity: GenericPalletError<Rv>;
+    InvalidInitialLiquidity: GenericPalletError;
 
     /**
      * Amplification is outside configured range.
      **/
-    InvalidAmplification: GenericPalletError<Rv>;
+    InvalidAmplification: GenericPalletError;
 
     /**
      * Remaining balance of share asset is below asset's existential deposit.
      **/
-    InsufficientShareBalance: GenericPalletError<Rv>;
+    InsufficientShareBalance: GenericPalletError;
 
     /**
      * Not allowed to perform an operation on given asset.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Future block number is in the past.
      **/
-    PastBlock: GenericPalletError<Rv>;
+    PastBlock: GenericPalletError;
 
     /**
      * New amplification is equal to the previous value.
      **/
-    SameAmplification: GenericPalletError<Rv>;
+    SameAmplification: GenericPalletError;
 
     /**
      * Slippage protection.
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Failed to retrieve asset decimals.
      **/
-    UnknownDecimals: GenericPalletError<Rv>;
+    UnknownDecimals: GenericPalletError;
 
     /**
      * List of provided pegs is incorrect.
      **/
-    IncorrectInitialPegs: GenericPalletError<Rv>;
+    IncorrectInitialPegs: GenericPalletError;
 
     /**
      * Failed to retrieve oracle entry.
      **/
-    MissingTargetPegOracle: GenericPalletError<Rv>;
+    MissingTargetPegOracle: GenericPalletError;
 
     /**
      * Creating pool with pegs is not allowed for asset with different decimals.
      **/
-    IncorrectAssetDecimals: GenericPalletError<Rv>;
+    IncorrectAssetDecimals: GenericPalletError;
 
     /**
      * Pool does not have pegs configured.
      **/
-    NoPegSource: GenericPalletError<Rv>;
+    NoPegSource: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bonds`'s errors
@@ -2096,42 +2096,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Bond not registered
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Bond is not mature
      **/
-    NotMature: GenericPalletError<Rv>;
+    NotMature: GenericPalletError;
 
     /**
      * Maturity not long enough
      **/
-    InvalidMaturity: GenericPalletError<Rv>;
+    InvalidMaturity: GenericPalletError;
 
     /**
      * Asset type not allowed for underlying asset
      **/
-    DisallowedAsset: GenericPalletError<Rv>;
+    DisallowedAsset: GenericPalletError;
 
     /**
      * Asset is not registered in `AssetRegistry`
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Generated name is not valid.
      **/
-    InvalidBondName: GenericPalletError<Rv>;
+    InvalidBondName: GenericPalletError;
 
     /**
      * Bond's name parsing was now successful
      **/
-    FailToParseName: GenericPalletError<Rv>;
+    FailToParseName: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OtcSettlements`'s errors
@@ -2140,42 +2140,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Otc order not found
      **/
-    OrderNotFound: GenericPalletError<Rv>;
+    OrderNotFound: GenericPalletError;
 
     /**
      * OTC order is not partially fillable
      **/
-    NotPartiallyFillable: GenericPalletError<Rv>;
+    NotPartiallyFillable: GenericPalletError;
 
     /**
      * Provided route doesn't match the existing route
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * Initial and final balance are different
      **/
-    BalanceInconsistency: GenericPalletError<Rv>;
+    BalanceInconsistency: GenericPalletError;
 
     /**
      * Trade amount higher than necessary
      **/
-    TradeAmountTooHigh: GenericPalletError<Rv>;
+    TradeAmountTooHigh: GenericPalletError;
 
     /**
      * Trade amount lower than necessary
      **/
-    TradeAmountTooLow: GenericPalletError<Rv>;
+    TradeAmountTooLow: GenericPalletError;
 
     /**
      * Price for a route is not available
      **/
-    PriceNotAvailable: GenericPalletError<Rv>;
+    PriceNotAvailable: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `LBP`'s errors
@@ -2184,122 +2184,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pool assets can not be the same
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Account is not a pool owner
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Sale already started
      **/
-    SaleStarted: GenericPalletError<Rv>;
+    SaleStarted: GenericPalletError;
 
     /**
      * Sale is still in progress
      **/
-    SaleNotEnded: GenericPalletError<Rv>;
+    SaleNotEnded: GenericPalletError;
 
     /**
      * Sale is not running
      **/
-    SaleIsNotRunning: GenericPalletError<Rv>;
+    SaleIsNotRunning: GenericPalletError;
 
     /**
      * Sale duration is too long
      **/
-    MaxSaleDurationExceeded: GenericPalletError<Rv>;
+    MaxSaleDurationExceeded: GenericPalletError;
 
     /**
      * Liquidity being added should not be zero
      **/
-    CannotAddZeroLiquidity: GenericPalletError<Rv>;
+    CannotAddZeroLiquidity: GenericPalletError;
 
     /**
      * Asset balance too low
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Pool does not exist
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * Pool has been already created
      **/
-    PoolAlreadyExists: GenericPalletError<Rv>;
+    PoolAlreadyExists: GenericPalletError;
 
     /**
      * Invalid block range
      **/
-    InvalidBlockRange: GenericPalletError<Rv>;
+    InvalidBlockRange: GenericPalletError;
 
     /**
      * Calculation error
      **/
-    WeightCalculationError: GenericPalletError<Rv>;
+    WeightCalculationError: GenericPalletError;
 
     /**
      * Weight set is out of range
      **/
-    InvalidWeight: GenericPalletError<Rv>;
+    InvalidWeight: GenericPalletError;
 
     /**
      * Can not perform a trade with zero amount
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Invalid fee amount
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Trading limit reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * An unexpected integer overflow occurred
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Nothing to update
      **/
-    NothingToUpdate: GenericPalletError<Rv>;
+    NothingToUpdate: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than minimum trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Not more than one fee collector per asset id
      **/
-    FeeCollectorWithAssetAlreadyUsed: GenericPalletError<Rv>;
+    FeeCollectorWithAssetAlreadyUsed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYK`'s errors
@@ -2308,139 +2308,139 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * It is not allowed to create a pool between same assets.
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than min trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Liquidity is zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * It is not allowed to create a pool with zero initial price.
      * Not used, kept for backward compatibility
      **/
-    ZeroInitialPrice: GenericPalletError<Rv>;
+    ZeroInitialPrice: GenericPalletError;
 
     /**
      * Overflow
      * Not used, kept for backward compatibility
      **/
-    CreatePoolAssetAmountInvalid: GenericPalletError<Rv>;
+    CreatePoolAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidMintedLiquidity: GenericPalletError<Rv>;
+    InvalidMintedLiquidity: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidLiquidityAmount: GenericPalletError<Rv>;
+    InvalidLiquidityAmount: GenericPalletError;
 
     /**
      * Asset amount has exceeded given limit.
      **/
-    AssetAmountExceededLimit: GenericPalletError<Rv>;
+    AssetAmountExceededLimit: GenericPalletError;
 
     /**
      * Asset amount has not reached given limit.
      **/
-    AssetAmountNotReachedLimit: GenericPalletError<Rv>;
+    AssetAmountNotReachedLimit: GenericPalletError;
 
     /**
      * Asset balance is not sufficient.
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Not enough asset liquidity in the pool.
      **/
-    InsufficientPoolAssetBalance: GenericPalletError<Rv>;
+    InsufficientPoolAssetBalance: GenericPalletError;
 
     /**
      * Not enough core asset liquidity in the pool.
      **/
-    InsufficientNativeCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientNativeCurrencyBalance: GenericPalletError;
 
     /**
      * Liquidity pool for given assets does not exist.
      **/
-    TokenPoolNotFound: GenericPalletError<Rv>;
+    TokenPoolNotFound: GenericPalletError;
 
     /**
      * Liquidity pool for given assets already exists.
      **/
-    TokenPoolAlreadyExists: GenericPalletError<Rv>;
+    TokenPoolAlreadyExists: GenericPalletError;
 
     /**
      * Overflow
      **/
-    AddAssetAmountInvalid: GenericPalletError<Rv>;
+    AddAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    RemoveAssetAmountInvalid: GenericPalletError<Rv>;
+    RemoveAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    SellAssetAmountInvalid: GenericPalletError<Rv>;
+    SellAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    BuyAssetAmountInvalid: GenericPalletError<Rv>;
+    BuyAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    CannotApplyDiscount: GenericPalletError<Rv>;
+    CannotApplyDiscount: GenericPalletError;
 
     /**
      * Max fraction of pool to buy in single transaction has been exceeded.
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Max fraction of pool to sell in single transaction has been exceeded.
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Pool cannot be created due to outside factors.
      **/
-    CannotCreatePool: GenericPalletError<Rv>;
+    CannotCreatePool: GenericPalletError;
 
     /**
      * Slippage protection.
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referrals`'s errors
@@ -2449,77 +2449,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referral code is too long.
      **/
-    TooLong: GenericPalletError<Rv>;
+    TooLong: GenericPalletError;
 
     /**
      * Referral code is too short.
      **/
-    TooShort: GenericPalletError<Rv>;
+    TooShort: GenericPalletError;
 
     /**
      * Referral code contains invalid character. Only alphanumeric characters are allowed.
      **/
-    InvalidCharacter: GenericPalletError<Rv>;
+    InvalidCharacter: GenericPalletError;
 
     /**
      * Referral code already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Provided referral code is invalid. Either does not exist or is too long.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Account is already linked to another referral account.
      **/
-    AlreadyLinked: GenericPalletError<Rv>;
+    AlreadyLinked: GenericPalletError;
 
     /**
      * Nothing in the referral pot account for the asset.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Linking an account to the same referral account is not allowed.
      **/
-    LinkNotAllowed: GenericPalletError<Rv>;
+    LinkNotAllowed: GenericPalletError;
 
     /**
      * Calculated rewards are more than the fee amount. This can happen if percentages are incorrectly set.
      **/
-    IncorrectRewardCalculation: GenericPalletError<Rv>;
+    IncorrectRewardCalculation: GenericPalletError;
 
     /**
      * Given referrer and trader percentages exceeds 100% percent.
      **/
-    IncorrectRewardPercentage: GenericPalletError<Rv>;
+    IncorrectRewardPercentage: GenericPalletError;
 
     /**
      * The account has already a code registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * Price for given asset pair not found.
      **/
-    PriceNotFound: GenericPalletError<Rv>;
+    PriceNotFound: GenericPalletError;
 
     /**
      * Minimum trading amount for conversion has not been reached.
      **/
-    ConversionMinTradingAmountNotReached: GenericPalletError<Rv>;
+    ConversionMinTradingAmountNotReached: GenericPalletError;
 
     /**
      * Zero amount received from conversion.
      **/
-    ConversionZeroAmountReceived: GenericPalletError<Rv>;
+    ConversionZeroAmountReceived: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Liquidation`'s errors
@@ -2528,37 +2528,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * AssetId to EVM address conversion failed
      **/
-    AssetConversionFailed: GenericPalletError<Rv>;
+    AssetConversionFailed: GenericPalletError;
 
     /**
      * Liquidation call failed
      **/
-    LiquidationCallFailed: GenericPalletError<Rv>;
+    LiquidationCallFailed: GenericPalletError;
 
     /**
      * Provided route doesn't match the existing route
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * Liquidation was not profitable enough to repay flash loan
      **/
-    NotProfitable: GenericPalletError<Rv>;
+    NotProfitable: GenericPalletError;
 
     /**
      * Flash minter contract address not set. It is required for Hollar liquidations.
      **/
-    FlashMinterNotSet: GenericPalletError<Rv>;
+    FlashMinterNotSet: GenericPalletError;
 
     /**
      * Invalid liquidation data provided
      **/
-    InvalidLiquidationData: GenericPalletError<Rv>;
+    InvalidLiquidationData: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `HSM`'s errors
@@ -2569,153 +2569,146 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * The operation attempted to use an asset that is not registered as an approved collateral.
      **/
-    AssetNotApproved: GenericPalletError<Rv>;
+    AssetNotApproved: GenericPalletError;
 
     /**
      * Asset is already approved as collateral
      *
      * Attempted to add an asset that is already registered as a collateral.
      **/
-    AssetAlreadyApproved: GenericPalletError<Rv>;
+    AssetAlreadyApproved: GenericPalletError;
 
     /**
      * Another asset from the same pool is already approved
      *
      * Only one asset from each StableSwap pool can be used as collateral.
      **/
-    PoolAlreadyHasCollateral: GenericPalletError<Rv>;
+    PoolAlreadyHasCollateral: GenericPalletError;
 
     /**
      * Invalid asset pair, must be Hollar and approved collateral
      *
      * The asset pair for buy/sell operations must include Hollar as one side and an approved collateral as the other.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Max buy price exceeded
      *
      * The calculated buy price exceeds the maximum allowed buy price for the collateral.
      **/
-    MaxBuyPriceExceeded: GenericPalletError<Rv>;
+    MaxBuyPriceExceeded: GenericPalletError;
 
     /**
      * Max buy back amount in single block exceeded
      *
      * The amount of Hollar being sold to HSM exceeds the maximum allowed in a single block for this collateral.
      **/
-    MaxBuyBackExceeded: GenericPalletError<Rv>;
+    MaxBuyBackExceeded: GenericPalletError;
 
     /**
      * Max holding amount for collateral exceeded
      *
      * The operation would cause the HSM to hold more of the collateral than the configured maximum.
      **/
-    MaxHoldingExceeded: GenericPalletError<Rv>;
+    MaxHoldingExceeded: GenericPalletError;
 
     /**
      * Slippage limit exceeded
      *
      * The calculated amount is worse than the provided slippage limit.
      **/
-    SlippageLimitExceeded: GenericPalletError<Rv>;
+    SlippageLimitExceeded: GenericPalletError;
 
     /**
      * Invalid EVM contract interaction
      *
      * The call to the EVM contract (GHO Hollar token) failed.
      **/
-    InvalidEVMInteraction: GenericPalletError<Rv>;
+    InvalidEVMInteraction: GenericPalletError;
 
     /**
      * Decimal retrieval failed
      *
      * Failed to retrieve the decimal information for an asset.
      **/
-    DecimalRetrievalFailed: GenericPalletError<Rv>;
+    DecimalRetrievalFailed: GenericPalletError;
 
     /**
      * No arbitrage opportunity
      *
      * There is no profitable arbitrage opportunity for the specified collateral.
      **/
-    NoArbitrageOpportunity: GenericPalletError<Rv>;
-
-    /**
-     * Offchain lock error
-     *
-     * Failed to acquire the lock for offchain workers, likely because another operation is in progress.
-     **/
-    OffchainLockError: GenericPalletError<Rv>;
+    NoArbitrageOpportunity: GenericPalletError;
 
     /**
      * Asset not in the pool
      *
      * The specified asset was not found in the pool.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Provided pool state is invalid
      *
      * The retrieved pool state has inconsistent or invalid data.
      **/
-    InvalidPoolState: GenericPalletError<Rv>;
+    InvalidPoolState: GenericPalletError;
 
     /**
      * Collateral is not empty
      *
      * Cannot remove a collateral asset that still has a non-zero balance in the HSM account.
      **/
-    CollateralNotEmpty: GenericPalletError<Rv>;
+    CollateralNotEmpty: GenericPalletError;
 
     /**
      * Asset not in the pool
      *
      * The collateral asset is not present in the specified pool.
      **/
-    AssetNotInPool: GenericPalletError<Rv>;
+    AssetNotInPool: GenericPalletError;
 
     /**
      * Hollar is not in the pool
      *
      * The Hollar asset is not present in the specified pool.
      **/
-    HollarNotInPool: GenericPalletError<Rv>;
+    HollarNotInPool: GenericPalletError;
 
     /**
      * Insufficient collateral balance
      *
      * The HSM does not have enough of the collateral asset to complete the operation.
      **/
-    InsufficientCollateralBalance: GenericPalletError<Rv>;
+    InsufficientCollateralBalance: GenericPalletError;
 
     /**
      * GHO Contract address not found
      *
      * The EVM address for the GHO (Hollar) token contract was not found.
      **/
-    HollarContractAddressNotFound: GenericPalletError<Rv>;
+    HollarContractAddressNotFound: GenericPalletError;
 
     /**
      * HSM contains maximum number of allowed collateral assets.
      **/
-    MaxNumberOfCollateralsReached: GenericPalletError<Rv>;
+    MaxNumberOfCollateralsReached: GenericPalletError;
 
     /**
      * Flash minter address not set
      **/
-    FlashMinterNotSet: GenericPalletError<Rv>;
+    FlashMinterNotSet: GenericPalletError;
 
     /**
      * Provided arbitrage data is invalid
      **/
-    InvalidArbitrageData: GenericPalletError<Rv>;
+    InvalidArbitrageData: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Tokens`'s errors
@@ -2724,43 +2717,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Cannot convert Amount into Balance type
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Failed because liquidity restrictions due to locking
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Failed because the maximum locks was exceeded
      **/
-    MaxLocksExceeded: GenericPalletError<Rv>;
+    MaxLocksExceeded: GenericPalletError;
 
     /**
      * Transfer/payment would kill account
      **/
-    KeepAlive: GenericPalletError<Rv>;
+    KeepAlive: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist
      **/
-    DeadAccount: GenericPalletError<Rv>;
-    TooManyReserves: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Currencies`'s errors
@@ -2769,27 +2762,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Unable to convert the Amount type into Balance.
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Deposit result is not expected
      **/
-    DepositFailed: GenericPalletError<Rv>;
+    DepositFailed: GenericPalletError;
 
     /**
      * Operation is not supported for this currency
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -2798,37 +2791,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting period is zero
      **/
-    ZeroVestingPeriod: GenericPalletError<Rv>;
+    ZeroVestingPeriod: GenericPalletError;
 
     /**
      * Number of vests is zero
      **/
-    ZeroVestingPeriodCount: GenericPalletError<Rv>;
+    ZeroVestingPeriodCount: GenericPalletError;
 
     /**
      * Insufficient amount of balance to lock
      **/
-    InsufficientBalanceToLock: GenericPalletError<Rv>;
+    InsufficientBalanceToLock: GenericPalletError;
 
     /**
      * This account have too many vesting schedules
      **/
-    TooManyVestingSchedules: GenericPalletError<Rv>;
+    TooManyVestingSchedules: GenericPalletError;
 
     /**
      * The vested transfer amount is too low
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * Failed because the maximum vesting schedules was exceeded
      **/
-    MaxVestingSchedulesExceeded: GenericPalletError<Rv>;
+    MaxVestingSchedulesExceeded: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVM`'s errors
@@ -2837,72 +2830,72 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not enough balance to perform action
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * Calculating total fee overflowed
      **/
-    FeeOverflow: GenericPalletError<Rv>;
+    FeeOverflow: GenericPalletError;
 
     /**
      * Calculating total payment overflowed
      **/
-    PaymentOverflow: GenericPalletError<Rv>;
+    PaymentOverflow: GenericPalletError;
 
     /**
      * Withdraw fee failed
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Gas price is too low.
      **/
-    GasPriceTooLow: GenericPalletError<Rv>;
+    GasPriceTooLow: GenericPalletError;
 
     /**
      * Nonce is invalid
      **/
-    InvalidNonce: GenericPalletError<Rv>;
+    InvalidNonce: GenericPalletError;
 
     /**
      * Gas limit is too low.
      **/
-    GasLimitTooLow: GenericPalletError<Rv>;
+    GasLimitTooLow: GenericPalletError;
 
     /**
      * Gas limit is too high.
      **/
-    GasLimitTooHigh: GenericPalletError<Rv>;
+    GasLimitTooHigh: GenericPalletError;
 
     /**
      * The chain id is invalid.
      **/
-    InvalidChainId: GenericPalletError<Rv>;
+    InvalidChainId: GenericPalletError;
 
     /**
      * the signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * EVM reentrancy
      **/
-    Reentrancy: GenericPalletError<Rv>;
+    Reentrancy: GenericPalletError;
 
     /**
      * EIP-3607,
      **/
-    TransactionMustComeFromEOA: GenericPalletError<Rv>;
+    TransactionMustComeFromEOA: GenericPalletError;
 
     /**
      * Undefined error.
      **/
-    Undefined: GenericPalletError<Rv>;
+    Undefined: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Ethereum`'s errors
@@ -2911,17 +2904,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Pre-log is present, therefore transact is not allowed.
      **/
-    PreLogExists: GenericPalletError<Rv>;
+    PreLogExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVMAccounts`'s errors
@@ -2930,27 +2923,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Active EVM account cannot be bound
      **/
-    TruncatedAccountAlreadyUsed: GenericPalletError<Rv>;
+    TruncatedAccountAlreadyUsed: GenericPalletError;
 
     /**
      * Address is already bound
      **/
-    AddressAlreadyBound: GenericPalletError<Rv>;
+    AddressAlreadyBound: GenericPalletError;
 
     /**
      * Bound address cannot be used
      **/
-    BoundAddressCannotBeUsed: GenericPalletError<Rv>;
+    BoundAddressCannotBeUsed: GenericPalletError;
 
     /**
      * Address not whitelisted
      **/
-    AddressNotWhitelisted: GenericPalletError<Rv>;
+    AddressNotWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKLiquidityMining`'s errors
@@ -2959,72 +2952,72 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Nft pallet didn't return an owner.
      **/
-    CantFindDepositOwner: GenericPalletError<Rv>;
+    CantFindDepositOwner: GenericPalletError;
 
     /**
      * Account balance of XYK pool shares is not sufficient.
      **/
-    InsufficientXykSharesBalance: GenericPalletError<Rv>;
+    InsufficientXykSharesBalance: GenericPalletError;
 
     /**
      * XYK pool does not exist
      **/
-    XykPoolDoesntExist: GenericPalletError<Rv>;
+    XykPoolDoesntExist: GenericPalletError;
 
     /**
      * Account is not deposit owner.
      **/
-    NotDepositOwner: GenericPalletError<Rv>;
+    NotDepositOwner: GenericPalletError;
 
     /**
      * XYK did not return assets for given pool id
      **/
-    CantGetXykAssets: GenericPalletError<Rv>;
+    CantGetXykAssets: GenericPalletError;
 
     /**
      * Deposit data not found
      **/
-    DepositDataNotFound: GenericPalletError<Rv>;
+    DepositDataNotFound: GenericPalletError;
 
     /**
      * Calculated reward to claim is 0.
      **/
-    ZeroClaimedRewards: GenericPalletError<Rv>;
+    ZeroClaimedRewards: GenericPalletError;
 
     /**
      * Asset is not in the `AssetPair`.
      **/
-    AssetNotInAssetPair: GenericPalletError<Rv>;
+    AssetNotInAssetPair: GenericPalletError;
 
     /**
      * Provided `AssetPair` is not used by the deposit.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Asset is not registered in asset registry.
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Failed to calculate `pot`'s account.
      **/
-    FailToGetPotId: GenericPalletError<Rv>;
+    FailToGetPotId: GenericPalletError;
 
     /**
      * No global farm - yield farm pairs specified to join
      **/
-    NoFarmsSpecified: GenericPalletError<Rv>;
+    NoFarmsSpecified: GenericPalletError;
 
     /**
      * Failed to calculate value of xyk shares
      **/
-    FailedToValueShares: GenericPalletError<Rv>;
+    FailedToValueShares: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKWarehouseLM`'s errors
@@ -3033,154 +3026,154 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Global farm does not exist.
      **/
-    GlobalFarmNotFound: GenericPalletError<Rv>;
+    GlobalFarmNotFound: GenericPalletError;
 
     /**
      * Yield farm does not exist.
      **/
-    YieldFarmNotFound: GenericPalletError<Rv>;
+    YieldFarmNotFound: GenericPalletError;
 
     /**
      * Multiple claims in the same period is not allowed.
      **/
-    DoubleClaimInPeriod: GenericPalletError<Rv>;
+    DoubleClaimInPeriod: GenericPalletError;
 
     /**
      * Liquidity mining is canceled.
      **/
-    LiquidityMiningCanceled: GenericPalletError<Rv>;
+    LiquidityMiningCanceled: GenericPalletError;
 
     /**
      * Liquidity mining is not canceled.
      **/
-    LiquidityMiningIsActive: GenericPalletError<Rv>;
+    LiquidityMiningIsActive: GenericPalletError;
 
     /**
      * Liquidity mining is in `active` or `terminated` state and action cannot be completed.
      **/
-    LiquidityMiningIsNotStopped: GenericPalletError<Rv>;
+    LiquidityMiningIsNotStopped: GenericPalletError;
 
     /**
      * Account is not allowed to perform action.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Yield farm multiplier can't be 0.
      **/
-    InvalidMultiplier: GenericPalletError<Rv>;
+    InvalidMultiplier: GenericPalletError;
 
     /**
      * Yield farm with given `amm_pool_id` already exists in global farm.
      **/
-    YieldFarmAlreadyExists: GenericPalletError<Rv>;
+    YieldFarmAlreadyExists: GenericPalletError;
 
     /**
      * Loyalty curve's initial reward percentage is not valid. Valid range is: [0, 1).
      **/
-    InvalidInitialRewardPercentage: GenericPalletError<Rv>;
+    InvalidInitialRewardPercentage: GenericPalletError;
 
     /**
      * One or more yield farms exist in global farm.
      **/
-    GlobalFarmIsNotEmpty: GenericPalletError<Rv>;
+    GlobalFarmIsNotEmpty: GenericPalletError;
 
     /**
      * Farm's `incentivized_asset` is missing in provided asset pair.
      **/
-    MissingIncentivizedAsset: GenericPalletError<Rv>;
+    MissingIncentivizedAsset: GenericPalletError;
 
     /**
      * Reward currency balance is not sufficient.
      **/
-    InsufficientRewardCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientRewardCurrencyBalance: GenericPalletError;
 
     /**
      * Blocks per period can't be 0.
      **/
-    InvalidBlocksPerPeriod: GenericPalletError<Rv>;
+    InvalidBlocksPerPeriod: GenericPalletError;
 
     /**
      * Yield per period can't be 0.
      **/
-    InvalidYieldPerPeriod: GenericPalletError<Rv>;
+    InvalidYieldPerPeriod: GenericPalletError;
 
     /**
      * Total rewards is less than `MinTotalFarmRewards`.
      **/
-    InvalidTotalRewards: GenericPalletError<Rv>;
+    InvalidTotalRewards: GenericPalletError;
 
     /**
      * Planned yielding periods is less than `MinPlannedYieldingPeriods`.
      **/
-    InvalidPlannedYieldingPeriods: GenericPalletError<Rv>;
+    InvalidPlannedYieldingPeriods: GenericPalletError;
 
     /**
      * Maximum number of locks reached for deposit.
      **/
-    MaxEntriesPerDeposit: GenericPalletError<Rv>;
+    MaxEntriesPerDeposit: GenericPalletError;
 
     /**
      * Trying to lock LP shares into already locked yield farm.
      **/
-    DoubleLock: GenericPalletError<Rv>;
+    DoubleLock: GenericPalletError;
 
     /**
      * Yield farm entry doesn't exist for given deposit.
      **/
-    YieldFarmEntryNotFound: GenericPalletError<Rv>;
+    YieldFarmEntryNotFound: GenericPalletError;
 
     /**
      * Max number of yield farms in global farm was reached. Global farm can't accept new
      * yield farms until some yield farm is not removed from storage.
      **/
-    GlobalFarmIsFull: GenericPalletError<Rv>;
+    GlobalFarmIsFull: GenericPalletError;
 
     /**
      * Invalid min. deposit was set for global farm.
      **/
-    InvalidMinDeposit: GenericPalletError<Rv>;
+    InvalidMinDeposit: GenericPalletError;
 
     /**
      * Price adjustment multiplier can't be 0.
      **/
-    InvalidPriceAdjustment: GenericPalletError<Rv>;
+    InvalidPriceAdjustment: GenericPalletError;
 
     /**
      * Account creation from id failed.
      **/
-    ErrorGetAccountId: GenericPalletError<Rv>;
+    ErrorGetAccountId: GenericPalletError;
 
     /**
      * Value of deposited shares amount in reward currency is bellow min. limit.
      **/
-    IncorrectValuedShares: GenericPalletError<Rv>;
+    IncorrectValuedShares: GenericPalletError;
 
     /**
      * `reward_currency` is not registered in asset registry.
      **/
-    RewardCurrencyNotRegistered: GenericPalletError<Rv>;
+    RewardCurrencyNotRegistered: GenericPalletError;
 
     /**
      * `incentivized_asset` is not registered in asset registry.
      **/
-    IncentivizedAssetNotRegistered: GenericPalletError<Rv>;
+    IncentivizedAssetNotRegistered: GenericPalletError;
 
     /**
      * Provided `amm_pool_id` doesn't match deposit's `amm_pool_id`.
      **/
-    AmmPoolIdMismatch: GenericPalletError<Rv>;
+    AmmPoolIdMismatch: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RelayChainInfo`'s errors
@@ -3189,7 +3182,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DCA`'s errors
@@ -3198,107 +3191,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Schedule not exist
      **/
-    ScheduleNotFound: GenericPalletError<Rv>;
+    ScheduleNotFound: GenericPalletError;
 
     /**
      * The min trade amount is not reached
      **/
-    MinTradeAmountNotReached: GenericPalletError<Rv>;
+    MinTradeAmountNotReached: GenericPalletError;
 
     /**
      * Forbidden as the user is not the owner of the schedule
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * The next execution block number is not in the future
      **/
-    BlockNumberIsNotInFuture: GenericPalletError<Rv>;
+    BlockNumberIsNotInFuture: GenericPalletError;
 
     /**
      * Price is unstable as price change from oracle data is bigger than max allowed
      **/
-    PriceUnstable: GenericPalletError<Rv>;
+    PriceUnstable: GenericPalletError;
 
     /**
      * Order was randomly rescheduled to next block
      **/
-    Bumped: GenericPalletError<Rv>;
+    Bumped: GenericPalletError;
 
     /**
      * Error occurred when calculating price
      **/
-    CalculatingPriceError: GenericPalletError<Rv>;
+    CalculatingPriceError: GenericPalletError;
 
     /**
      * The total amount to be reserved is smaller than min budget
      **/
-    TotalAmountIsSmallerThanMinBudget: GenericPalletError<Rv>;
+    TotalAmountIsSmallerThanMinBudget: GenericPalletError;
 
     /**
      * The budget is too low for executing at least two orders
      **/
-    BudgetTooLow: GenericPalletError<Rv>;
+    BudgetTooLow: GenericPalletError;
 
     /**
      * There is no free block found to plan DCA execution
      **/
-    NoFreeBlockFound: GenericPalletError<Rv>;
+    NoFreeBlockFound: GenericPalletError;
 
     /**
      * The DCA schedule has been manually terminated
      **/
-    ManuallyTerminated: GenericPalletError<Rv>;
+    ManuallyTerminated: GenericPalletError;
 
     /**
      * Max number of retries reached for schedule
      **/
-    MaxRetryReached: GenericPalletError<Rv>;
+    MaxRetryReached: GenericPalletError;
 
     /**
      * Absolutely trade limit reached, leading to retry
      **/
-    TradeLimitReached: GenericPalletError<Rv>;
+    TradeLimitReached: GenericPalletError;
 
     /**
      * Slippage limit calculated from oracle is reached, leading to retry
      **/
-    SlippageLimitReached: GenericPalletError<Rv>;
+    SlippageLimitReached: GenericPalletError;
 
     /**
      * No parent hash has been found from relay chain
      **/
-    NoParentHashFound: GenericPalletError<Rv>;
+    NoParentHashFound: GenericPalletError;
 
     /**
      * Error that should not really happen only in case of invalid state of the schedule storage entries
      **/
-    InvalidState: GenericPalletError<Rv>;
+    InvalidState: GenericPalletError;
 
     /**
      * Period should be longer than 5 blocks
      **/
-    PeriodTooShort: GenericPalletError<Rv>;
+    PeriodTooShort: GenericPalletError;
 
     /**
      * Stability threshold cannot be higher than `MaxConfigurablePriceDifferenceBetweenBlock`
      **/
-    StabilityThresholdTooHigh: GenericPalletError<Rv>;
+    StabilityThresholdTooHigh: GenericPalletError;
 
     /**
      * User still has active DCA schedules and cannot unlock reserves
      **/
-    HasActiveSchedules: GenericPalletError<Rv>;
+    HasActiveSchedules: GenericPalletError;
 
     /**
      * No reserves are locked for the user for the given asset
      **/
-    NoReservesLocked: GenericPalletError<Rv>;
+    NoReservesLocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -3307,32 +3300,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -3341,48 +3334,48 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * No code upgrade has been authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The given code upgrade has not been authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -3392,129 +3385,129 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -3523,32 +3516,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -3558,32 +3551,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -3591,24 +3584,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OrmlXcm`'s errors
@@ -3618,24 +3611,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The message and destination combination was not recognized as being
      * reachable.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The message and destination was recognized as being reachable but
      * the operation could not be completed.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XTokens`'s errors
@@ -3644,110 +3637,110 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset has no reserve location.
      **/
-    AssetHasNoReserve: GenericPalletError<Rv>;
+    AssetHasNoReserve: GenericPalletError;
 
     /**
      * Not cross-chain transfer.
      **/
-    NotCrossChainTransfer: GenericPalletError<Rv>;
+    NotCrossChainTransfer: GenericPalletError;
 
     /**
      * Invalid transfer destination.
      **/
-    InvalidDest: GenericPalletError<Rv>;
+    InvalidDest: GenericPalletError;
 
     /**
      * Currency is not cross-chain transferable.
      **/
-    NotCrossChainTransferableCurrency: GenericPalletError<Rv>;
+    NotCrossChainTransferableCurrency: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * XCM execution failed.
      **/
-    XcmExecutionFailed: GenericPalletError<Rv>;
+    XcmExecutionFailed: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the
      * destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Could not get ancestry of asset reserve location.
      **/
-    InvalidAncestry: GenericPalletError<Rv>;
+    InvalidAncestry: GenericPalletError;
 
     /**
      * The Asset is invalid.
      **/
-    InvalidAsset: GenericPalletError<Rv>;
+    InvalidAsset: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * We tried sending distinct asset and fee but they have different
      * reserve chains.
      **/
-    DistinctReserveForAssetAndFee: GenericPalletError<Rv>;
+    DistinctReserveForAssetAndFee: GenericPalletError;
 
     /**
      * The fee is zero.
      **/
-    ZeroFee: GenericPalletError<Rv>;
+    ZeroFee: GenericPalletError;
 
     /**
      * The transfering asset amount is zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * The number of assets to be sent is over the maximum.
      **/
-    TooManyAssetsBeingSent: GenericPalletError<Rv>;
+    TooManyAssetsBeingSent: GenericPalletError;
 
     /**
      * The specified index does not exist in a Assets struct.
      **/
-    AssetIndexNonExistent: GenericPalletError<Rv>;
+    AssetIndexNonExistent: GenericPalletError;
 
     /**
      * Fee is not enough.
      **/
-    FeeNotEnough: GenericPalletError<Rv>;
+    FeeNotEnough: GenericPalletError;
 
     /**
      * Not supported Location
      **/
-    NotSupportedLocation: GenericPalletError<Rv>;
+    NotSupportedLocation: GenericPalletError;
 
     /**
      * MinXcmFee not registered for certain reserve location
      **/
-    MinXcmFeeNotDefined: GenericPalletError<Rv>;
+    MinXcmFeeNotDefined: GenericPalletError;
 
     /**
      * Asset transfer is limited by RateLimiter.
      **/
-    RateLimited: GenericPalletError<Rv>;
+    RateLimited: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `UnknownTokens`'s errors
@@ -3756,22 +3749,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * The operation will cause balance to overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Unhandled asset.
      **/
-    UnhandledAsset: GenericPalletError<Rv>;
+    UnhandledAsset: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -3780,92 +3773,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -3874,55 +3867,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
+
+    /**
+     * Generic pallet error
+     **/
+    [error: string]: GenericPalletError;
+  };
+  /**
+   * Pallet `Ismp`'s errors
+   **/
+  ismp: {
+    /**
+     * Invalid ISMP message
+     **/
+    InvalidMessage: GenericPalletError;
+
+    /**
+     * Requested message was not found
+     **/
+    MessageNotFound: GenericPalletError;
+
+    /**
+     * Encountered an error while creating the consensus client.
+     **/
+    ConsensusClientCreationFailed: GenericPalletError;
+
+    /**
+     * Couldn't update unbonding period
+     **/
+    UnbondingPeriodUpdateFailed: GenericPalletError;
+
+    /**
+     * Couldn't update challenge period
+     **/
+    ChallengePeriodUpdateFailed: GenericPalletError;
+
+    /**
+     * Generic pallet error
+     **/
+    [error: string]: GenericPalletError;
+  };
+  /**
+   * Pallet `Hyperbridge`'s errors
+   **/
+  hyperbridge: {
+    /**
+     * Generic pallet error
+     **/
+    [error: string]: GenericPalletError;
+  };
+  /**
+   * Pallet `TokenGateway`'s errors
+   **/
+  tokenGateway: {
+    /**
+     * A asset that has not been registered
+     **/
+    UnregisteredAsset: GenericPalletError;
+
+    /**
+     * Error while teleporting asset
+     **/
+    AssetTeleportError: GenericPalletError;
+
+    /**
+     * Coprocessor was not configured in the runtime
+     **/
+    CoprocessorNotConfigured: GenericPalletError;
+
+    /**
+     * Asset or update Dispatch Error
+     **/
+    DispatchError: GenericPalletError;
+
+    /**
+     * Asset Id creation failed
+     **/
+    AssetCreationError: GenericPalletError;
+
+    /**
+     * Asset decimals not found
+     **/
+    AssetDecimalsNotFound: GenericPalletError;
+
+    /**
+     * Protocol Params have not been initialized
+     **/
+    NotInitialized: GenericPalletError;
+
+    /**
+     * Unknown Asset
+     **/
+    UnknownAsset: GenericPalletError;
+
+    /**
+     * Only root or asset owner can update asset
+     **/
+    NotAssetOwner: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EmaOracle`'s errors
    **/
   emaOracle: {
-    TooManyUniqueEntries: GenericPalletError<Rv>;
-    OnTradeValueZero: GenericPalletError<Rv>;
-    OracleNotFound: GenericPalletError<Rv>;
+    TooManyUniqueEntries: GenericPalletError;
+    OnTradeValueZero: GenericPalletError;
+    OracleNotFound: GenericPalletError;
 
     /**
      * Asset not found
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * The new price is outside the max allowed range
      **/
-    PriceOutsideAllowedRange: GenericPalletError<Rv>;
+    PriceOutsideAllowedRange: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Broadcast`'s errors
@@ -3931,16 +4021,16 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The execution context call stack has reached its maximum size
      **/
-    ExecutionCallStackOverflow: GenericPalletError<Rv>;
+    ExecutionCallStackOverflow: GenericPalletError;
 
     /**
      * The execution context call stack is empty, unable to decrease level
      **/
-    ExecutionCallStackUnderflow: GenericPalletError<Rv>;
+    ExecutionCallStackUnderflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/hydration/events.d.ts b/packages/chaintypes/src/hydration/events.d.ts
index 36c70135..7acb3574 100644
--- a/packages/chaintypes/src/hydration/events.d.ts
+++ b/packages/chaintypes/src/hydration/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchInfo,
   DispatchError,
@@ -61,6 +61,14 @@ import type {
   CumulusPrimitivesCoreAggregateMessageOrigin,
   FrameSupportMessagesProcessMessageError,
   StagingXcmV4Asset,
+  IsmpConsensusStateMachineId,
+  IsmpConsensusStateMachineHeight,
+  IsmpHostStateMachine,
+  PalletIsmpErrorsHandlingError,
+  IsmpEventsRequestResponseHandled,
+  IsmpEventsTimeoutHandled,
+  IsmpParachainParachainData,
+  PalletHyperbridgeVersionedHostParams,
   PalletBroadcastFiller,
   PalletBroadcastTradeOperation,
   PalletBroadcastAsset,
@@ -68,7 +76,7 @@ import type {
   PalletBroadcastExecutionType,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -76,13 +84,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<Rv, 'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: DispatchInfo }
@@ -91,32 +98,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -125,40 +132,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -167,82 +173,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -253,7 +259,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -262,7 +267,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiTransactionPayment`'s events
@@ -273,7 +278,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [who, currency]
      **/
     CurrencySet: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'CurrencySet',
       { accountId: AccountId32; assetId: number }
@@ -283,20 +287,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New accepted currency added
      * [currency]
      **/
-    CurrencyAdded: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
+    CurrencyAdded: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
 
     /**
      * Accepted currency removed
      * [currency]
      **/
-    CurrencyRemoved: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
+    CurrencyRemoved: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
 
     /**
      * Transaction fee paid in non-native currency
      * [Account, Currency, Native fee amount, Non-native fee amount, Destination account]
      **/
     FeeWithdrawn: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'FeeWithdrawn',
       {
@@ -311,7 +314,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -320,38 +323,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -360,18 +357,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       { index: number; assetKind: []; amount: bigint; beneficiary: AccountId32; validFrom: number; expireAt: number }
@@ -380,28 +371,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -411,37 +402,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -450,22 +441,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -474,23 +465,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -500,7 +490,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -509,23 +498,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -535,7 +518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -546,7 +528,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -555,23 +536,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -580,19 +560,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -601,7 +580,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Democracy`'s events
@@ -610,68 +589,62 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion has been proposed by a public account.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
+    Proposed: GenericPalletEvent<'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * A public proposal has been tabled for referendum vote.
      **/
-    Tabled: GenericPalletEvent<Rv, 'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
+    Tabled: GenericPalletEvent<'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * An external proposal has been tabled.
      **/
-    ExternalTabled: GenericPalletEvent<Rv, 'Democracy', 'ExternalTabled', null>;
+    ExternalTabled: GenericPalletEvent<'Democracy', 'ExternalTabled', null>;
 
     /**
      * A referendum has begun.
      **/
-    Started: GenericPalletEvent<
-      Rv,
-      'Democracy',
-      'Started',
-      { refIndex: number; threshold: PalletDemocracyVoteThreshold }
-    >;
+    Started: GenericPalletEvent<'Democracy', 'Started', { refIndex: number; threshold: PalletDemocracyVoteThreshold }>;
 
     /**
      * A proposal has been approved by referendum.
      **/
-    Passed: GenericPalletEvent<Rv, 'Democracy', 'Passed', { refIndex: number }>;
+    Passed: GenericPalletEvent<'Democracy', 'Passed', { refIndex: number }>;
 
     /**
      * A proposal has been rejected by referendum.
      **/
-    NotPassed: GenericPalletEvent<Rv, 'Democracy', 'NotPassed', { refIndex: number }>;
+    NotPassed: GenericPalletEvent<'Democracy', 'NotPassed', { refIndex: number }>;
 
     /**
      * A referendum has been cancelled.
      **/
-    Cancelled: GenericPalletEvent<Rv, 'Democracy', 'Cancelled', { refIndex: number }>;
+    Cancelled: GenericPalletEvent<'Democracy', 'Cancelled', { refIndex: number }>;
 
     /**
      * An account has delegated their vote to another account.
      **/
-    Delegated: GenericPalletEvent<Rv, 'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
+    Delegated: GenericPalletEvent<'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
 
     /**
      * An account has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'Democracy', 'Undelegated', { account: AccountId32 }>;
+    Undelegated: GenericPalletEvent<'Democracy', 'Undelegated', { account: AccountId32 }>;
 
     /**
      * An external proposal has been vetoed.
      **/
-    Vetoed: GenericPalletEvent<Rv, 'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
+    Vetoed: GenericPalletEvent<'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
 
     /**
      * A proposal_hash has been blacklisted permanently.
      **/
-    Blacklisted: GenericPalletEvent<Rv, 'Democracy', 'Blacklisted', { proposalHash: H256 }>;
+    Blacklisted: GenericPalletEvent<'Democracy', 'Blacklisted', { proposalHash: H256 }>;
 
     /**
      * An account has voted in a referendum
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Democracy',
       'Voted',
       { voter: AccountId32; refIndex: number; vote: PalletDemocracyVoteAccountVote }
@@ -680,18 +653,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has secconded a proposal
      **/
-    Seconded: GenericPalletEvent<Rv, 'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
+    Seconded: GenericPalletEvent<'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
 
     /**
      * A proposal got canceled.
      **/
-    ProposalCanceled: GenericPalletEvent<Rv, 'Democracy', 'ProposalCanceled', { propIndex: number }>;
+    ProposalCanceled: GenericPalletEvent<'Democracy', 'ProposalCanceled', { propIndex: number }>;
 
     /**
      * Metadata for a proposal or a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataSet',
       {
@@ -711,7 +683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a proposal or a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataCleared',
       {
@@ -731,7 +702,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata has been transferred to new owner.
      **/
     MetadataTransferred: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataTransferred',
       {
@@ -755,7 +725,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommittee`'s events
@@ -766,7 +736,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -777,7 +746,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -786,18 +754,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -807,7 +774,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -816,12 +782,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -830,14 +796,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: HydradxRuntimeSystemProxyType; disambiguationIndex: number }
@@ -846,13 +811,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: HydradxRuntimeSystemProxyType; delay: number }
@@ -862,7 +826,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: HydradxRuntimeSystemProxyType; delay: number }
@@ -871,7 +834,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -881,7 +844,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -891,7 +853,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -901,7 +862,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -917,7 +877,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -926,7 +885,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -935,33 +894,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: bigint; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: bigint; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: bigint }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: bigint }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: bigint; item: bigint; from: AccountId32; to: AccountId32 }
@@ -970,38 +923,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: bigint }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: bigint }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: bigint }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: bigint }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: bigint; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1012,7 +964,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -1023,7 +974,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -1032,13 +982,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: bigint }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: bigint }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: bigint; data: Bytes; isFrozen: boolean }
@@ -1047,13 +996,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: bigint; item: bigint; data: Bytes; isFrozen: boolean }
@@ -1062,23 +1010,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: bigint; successfulItems: Array<bigint> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: bigint; successfulItems: Array<bigint> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes; value: Bytes }
@@ -1088,7 +1030,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes }
@@ -1098,7 +1039,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: bigint | undefined }
@@ -1108,7 +1048,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: bigint; maxSupply: number }
@@ -1118,7 +1057,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: bigint; item: bigint; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -1127,13 +1065,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: bigint; item: bigint; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -1142,7 +1079,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -1153,7 +1090,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -1162,22 +1098,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -1186,18 +1122,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account that has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1207,7 +1142,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote that been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1216,7 +1150,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -1226,7 +1160,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -1251,7 +1184,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -1276,7 +1208,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -1301,7 +1232,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -1321,7 +1251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -1347,7 +1276,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -1358,7 +1286,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -1373,7 +1300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -1393,7 +1319,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1408,7 +1333,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1428,7 +1352,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1448,7 +1371,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1468,7 +1390,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1488,7 +1409,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1513,7 +1433,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1533,7 +1452,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1552,16 +1470,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1570,20 +1487,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Dispatcher`'s events
    **/
   dispatcher: {
     TreasuryManagerCallDispatched: GenericPalletEvent<
-      Rv,
       'Dispatcher',
       'TreasuryManagerCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
     >;
     AaveManagerCallDispatched: GenericPalletEvent<
-      Rv,
       'Dispatcher',
       'AaveManagerCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1592,7 +1507,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRegistry`'s events
@@ -1603,7 +1518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `SufficiencyCheck` triggers this event.
      **/
     ExistentialDepositPaid: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'ExistentialDepositPaid',
       { who: AccountId32; feeAsset: number; amount: bigint }
@@ -1613,7 +1527,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was registered.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Registered',
       {
@@ -1632,7 +1545,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was updated.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Updated',
       {
@@ -1651,7 +1563,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Native location set for an asset.
      **/
     LocationSet: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'LocationSet',
       { assetId: number; location: HydradxRuntimeXcmAssetLocation }
@@ -1660,28 +1571,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset was banned.
      **/
-    AssetBanned: GenericPalletEvent<Rv, 'AssetRegistry', 'AssetBanned', { assetId: number }>;
+    AssetBanned: GenericPalletEvent<'AssetRegistry', 'AssetBanned', { assetId: number }>;
 
     /**
      * Asset's ban was removed.
      **/
-    AssetUnbanned: GenericPalletEvent<Rv, 'AssetRegistry', 'AssetUnbanned', { assetId: number }>;
+    AssetUnbanned: GenericPalletEvent<'AssetRegistry', 'AssetUnbanned', { assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
    **/
   claims: {
-    Claim: GenericPalletEvent<Rv, 'Claims', 'Claim', [AccountId32, PalletClaimsEthereumAddress, bigint]>;
+    Claim: GenericPalletEvent<'Claims', 'Claim', [AccountId32, PalletClaimsEthereumAddress, bigint]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorRewards`'s events
@@ -1691,7 +1602,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Collator was rewarded.
      **/
     CollatorRewarded: GenericPalletEvent<
-      Rv,
       'CollatorRewards',
       'CollatorRewarded',
       { who: AccountId32; amount: bigint; currency: number }
@@ -1700,7 +1610,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Omnipool`'s events
@@ -1710,7 +1620,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset was added to Omnipool
      **/
     TokenAdded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TokenAdded',
       { assetId: number; initialAmount: bigint; initialPrice: FixedU128 }
@@ -1720,7 +1629,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset was removed from Omnipool
      **/
     TokenRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TokenRemoved',
       { assetId: number; amount: bigint; hubWithdrawn: bigint }
@@ -1730,7 +1638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity of an asset was added to Omnipool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'LiquidityAdded',
       { who: AccountId32; assetId: number; amount: bigint; positionId: bigint }
@@ -1740,7 +1647,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity of an asset was removed from Omnipool.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'LiquidityRemoved',
       { who: AccountId32; positionId: bigint; assetId: number; sharesRemoved: bigint; fee: FixedU128 }
@@ -1750,7 +1656,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * PRotocol Liquidity was removed from Omnipool.
      **/
     ProtocolLiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'ProtocolLiquidityRemoved',
       { who: AccountId32; assetId: number; amount: bigint; hubAmount: bigint; sharesRemoved: bigint }
@@ -1761,7 +1666,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'SellExecuted',
       {
@@ -1782,7 +1686,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'BuyExecuted',
       {
@@ -1802,7 +1705,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP Position was created and NFT instance minted.
      **/
     PositionCreated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'PositionCreated',
       { positionId: bigint; owner: AccountId32; asset: number; amount: bigint; shares: bigint; price: FixedU128 }
@@ -1811,18 +1713,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * LP Position was destroyed and NFT instance burned.
      **/
-    PositionDestroyed: GenericPalletEvent<
-      Rv,
-      'Omnipool',
-      'PositionDestroyed',
-      { positionId: bigint; owner: AccountId32 }
-    >;
+    PositionDestroyed: GenericPalletEvent<'Omnipool', 'PositionDestroyed', { positionId: bigint; owner: AccountId32 }>;
 
     /**
      * LP Position was updated.
      **/
     PositionUpdated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'PositionUpdated',
       { positionId: bigint; owner: AccountId32; asset: number; amount: bigint; shares: bigint; price: FixedU128 }
@@ -1832,7 +1728,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset's tradable state has been updated.
      **/
     TradableStateUpdated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TradableStateUpdated',
       { assetId: number; state: PalletOmnipoolTradability }
@@ -1842,7 +1737,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Amount has been refunded for asset which has not been accepted to add to omnipool.
      **/
     AssetRefunded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'AssetRefunded',
       { assetId: number; amount: bigint; recipient: AccountId32 }
@@ -1851,17 +1745,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset's weight cap has been updated.
      **/
-    AssetWeightCapUpdated: GenericPalletEvent<
-      Rv,
-      'Omnipool',
-      'AssetWeightCapUpdated',
-      { assetId: number; cap: Permill }
-    >;
+    AssetWeightCapUpdated: GenericPalletEvent<'Omnipool', 'AssetWeightCapUpdated', { assetId: number; cap: Permill }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPause`'s events
@@ -1871,7 +1760,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Paused transaction
      **/
     TransactionPaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionPaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -1881,7 +1769,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unpaused transaction
      **/
     TransactionUnpaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionUnpaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -1890,7 +1777,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Duster`'s events
@@ -1899,22 +1786,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Account dusted.
      **/
-    Dusted: GenericPalletEvent<Rv, 'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
+    Dusted: GenericPalletEvent<'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Account added to non-dustable list.
      **/
-    Added: GenericPalletEvent<Rv, 'Duster', 'Added', { who: AccountId32 }>;
+    Added: GenericPalletEvent<'Duster', 'Added', { who: AccountId32 }>;
 
     /**
      * Account removed from non-dustable list.
      **/
-    Removed: GenericPalletEvent<Rv, 'Duster', 'Removed', { who: AccountId32 }>;
+    Removed: GenericPalletEvent<'Duster', 'Removed', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s events
@@ -1924,7 +1811,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm accumulated reward per share was updated.
      **/
     GlobalFarmAccRPZUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolWarehouseLM',
       'GlobalFarmAccRPZUpdated',
       { globalFarmId: number; accumulatedRpz: FixedU128; totalSharesZ: bigint }
@@ -1934,7 +1820,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm accumulated reward per valued share was updated.
      **/
     YieldFarmAccRPVSUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolWarehouseLM',
       'YieldFarmAccRPVSUpdated',
       { globalFarmId: number; yieldFarmId: number; accumulatedRpvs: FixedU128; totalValuedShares: bigint }
@@ -1943,17 +1828,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Global farm has no more rewards to distribute in the moment.
      **/
-    AllRewardsDistributed: GenericPalletEvent<
-      Rv,
-      'OmnipoolWarehouseLM',
-      'AllRewardsDistributed',
-      { globalFarmId: number }
-    >;
+    AllRewardsDistributed: GenericPalletEvent<'OmnipoolWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s events
@@ -1963,7 +1843,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New global farm was created.
      **/
     GlobalFarmCreated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmCreated',
       {
@@ -1984,7 +1863,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was updated
      **/
     GlobalFarmUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmUpdated',
       { id: number; plannedYieldingPeriods: number; yieldPerPeriod: Perquintill; minDeposit: bigint }
@@ -1994,7 +1872,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was terminated.
      **/
     GlobalFarmTerminated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmTerminated',
       { globalFarmId: number; who: AccountId32; rewardCurrency: number; undistributedRewards: bigint }
@@ -2004,7 +1881,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New yield farm was added to the farm.
      **/
     YieldFarmCreated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmCreated',
       {
@@ -2020,7 +1896,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm multiplier was updated.
      **/
     YieldFarmUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmUpdated',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32; multiplier: FixedU128 }
@@ -2030,7 +1905,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for `asset_id` was stopped.
      **/
     YieldFarmStopped: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmStopped',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32 }
@@ -2040,7 +1914,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for `asset_id` was resumed.
      **/
     YieldFarmResumed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmResumed',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32; multiplier: FixedU128 }
@@ -2050,7 +1923,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm was terminated from the global farm.
      **/
     YieldFarmTerminated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmTerminated',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32 }
@@ -2060,7 +1932,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New LP shares(LP position) were deposited.
      **/
     SharesDeposited: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesDeposited',
       {
@@ -2078,7 +1949,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Already locked LP shares were redeposited to another yield farm.
      **/
     SharesRedeposited: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesRedeposited',
       {
@@ -2096,7 +1966,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards were claimed.
      **/
     RewardClaimed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'RewardClaimed',
       {
@@ -2113,7 +1982,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP shares were withdrawn.
      **/
     SharesWithdrawn: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesWithdrawn',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; amount: bigint; depositId: bigint }
@@ -2123,7 +1991,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All LP shares were unlocked and NFT representing deposit was destroyed.
      **/
     DepositDestroyed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'DepositDestroyed',
       { who: AccountId32; depositId: bigint }
@@ -2132,7 +1999,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OTC`'s events
@@ -2141,14 +2008,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An Order has been cancelled
      **/
-    Cancelled: GenericPalletEvent<Rv, 'OTC', 'Cancelled', { orderId: number }>;
+    Cancelled: GenericPalletEvent<'OTC', 'Cancelled', { orderId: number }>;
 
     /**
      * An Order has been completely filled
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     Filled: GenericPalletEvent<
-      Rv,
       'OTC',
       'Filled',
       { orderId: number; who: AccountId32; amountIn: bigint; amountOut: bigint; fee: bigint }
@@ -2159,7 +2025,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     PartiallyFilled: GenericPalletEvent<
-      Rv,
       'OTC',
       'PartiallyFilled',
       { orderId: number; who: AccountId32; amountIn: bigint; amountOut: bigint; fee: bigint }
@@ -2169,7 +2034,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An Order has been placed
      **/
     Placed: GenericPalletEvent<
-      Rv,
       'OTC',
       'Placed',
       {
@@ -2185,7 +2049,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CircuitBreaker`'s events
@@ -2195,7 +2059,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Trade volume limit of an asset was changed.
      **/
     TradeVolumeLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'TradeVolumeLimitChanged',
       { assetId: number; tradeVolumeLimit: [number, number] }
@@ -2205,7 +2068,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Add liquidity limit of an asset was changed.
      **/
     AddLiquidityLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'AddLiquidityLimitChanged',
       { assetId: number; liquidityLimit?: [number, number] | undefined }
@@ -2215,7 +2077,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Remove liquidity limit of an asset was changed.
      **/
     RemoveLiquidityLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'RemoveLiquidityLimitChanged',
       { assetId: number; liquidityLimit?: [number, number] | undefined }
@@ -2224,22 +2085,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset went to lockdown
      **/
-    AssetLockdown: GenericPalletEvent<Rv, 'CircuitBreaker', 'AssetLockdown', { assetId: number; until: number }>;
+    AssetLockdown: GenericPalletEvent<'CircuitBreaker', 'AssetLockdown', { assetId: number; until: number }>;
 
     /**
      * Asset lockdown was removed
      **/
-    AssetLockdownRemoved: GenericPalletEvent<Rv, 'CircuitBreaker', 'AssetLockdownRemoved', { assetId: number }>;
+    AssetLockdownRemoved: GenericPalletEvent<'CircuitBreaker', 'AssetLockdownRemoved', { assetId: number }>;
 
     /**
      * All reserved amount of deposit was released
      **/
-    DepositReleased: GenericPalletEvent<Rv, 'CircuitBreaker', 'DepositReleased', { who: AccountId32; assetId: number }>;
+    DepositReleased: GenericPalletEvent<'CircuitBreaker', 'DepositReleased', { who: AccountId32; assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Router`'s events
@@ -2249,7 +2110,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The route with trades has been successfully executed
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Router',
       'Executed',
       { assetIn: number; assetOut: number; amountIn: bigint; amountOut: bigint; eventId: number }
@@ -2258,12 +2118,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The route with trades has been successfully executed
      **/
-    RouteUpdated: GenericPalletEvent<Rv, 'Router', 'RouteUpdated', { assetIds: Array<number> }>;
+    RouteUpdated: GenericPalletEvent<'Router', 'RouteUpdated', { assetIds: Array<number> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DynamicFees`'s events
@@ -2273,7 +2133,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset fee configuration has been set
      **/
     AssetFeeConfigSet: GenericPalletEvent<
-      Rv,
       'DynamicFees',
       'AssetFeeConfigSet',
       { assetId: number; params: PalletDynamicFeesAssetFeeConfig }
@@ -2282,12 +2141,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset fee configuration has been removed
      **/
-    AssetFeeConfigRemoved: GenericPalletEvent<Rv, 'DynamicFees', 'AssetFeeConfigRemoved', { assetId: number }>;
+    AssetFeeConfigRemoved: GenericPalletEvent<'DynamicFees', 'AssetFeeConfigRemoved', { assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -2297,7 +2156,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New staking position was created and NFT was minted.
      **/
     PositionCreated: GenericPalletEvent<
-      Rv,
       'Staking',
       'PositionCreated',
       { who: AccountId32; positionId: bigint; stake: bigint }
@@ -2307,7 +2165,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Staked amount for existing position was increased.
      **/
     StakeAdded: GenericPalletEvent<
-      Rv,
       'Staking',
       'StakeAdded',
       {
@@ -2325,7 +2182,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards were claimed.
      **/
     RewardsClaimed: GenericPalletEvent<
-      Rv,
       'Staking',
       'RewardsClaimed',
       {
@@ -2343,7 +2199,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Staked amount was withdrawn and NFT was burned.
      **/
     Unstaked: GenericPalletEvent<
-      Rv,
       'Staking',
       'Unstaked',
       { who: AccountId32; positionId: bigint; unlockedStake: bigint }
@@ -2352,13 +2207,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Staking was initialized.
      **/
-    StakingInitialized: GenericPalletEvent<Rv, 'Staking', 'StakingInitialized', { nonDustableBalance: bigint }>;
+    StakingInitialized: GenericPalletEvent<'Staking', 'StakingInitialized', { nonDustableBalance: bigint }>;
 
     /**
      * Staking's `accumulated_reward_per_stake` was updated.
      **/
     AccumulatedRpsUpdated: GenericPalletEvent<
-      Rv,
       'Staking',
       'AccumulatedRpsUpdated',
       { accumulatedRps: FixedU128; totalStake: bigint }
@@ -2367,7 +2221,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Stableswap`'s events
@@ -2377,7 +2231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolCreated',
       {
@@ -2392,13 +2245,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pool fee has been updated.
      **/
-    FeeUpdated: GenericPalletEvent<Rv, 'Stableswap', 'FeeUpdated', { poolId: number; fee: Permill }>;
+    FeeUpdated: GenericPalletEvent<'Stableswap', 'FeeUpdated', { poolId: number; fee: Permill }>;
 
     /**
      * Liquidity of an asset was added to a pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'LiquidityAdded',
       { poolId: number; who: AccountId32; shares: bigint; assets: Array<HydradxTraitsStableswapAssetAmount> }
@@ -2408,7 +2260,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity removed.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'LiquidityRemoved',
       {
@@ -2425,7 +2276,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'SellExecuted',
       {
@@ -2444,7 +2294,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'BuyExecuted',
       {
@@ -2462,7 +2311,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset's tradable state has been updated.
      **/
     TradableStateUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'TradableStateUpdated',
       { poolId: number; assetId: number; state: PalletStableswapTradability }
@@ -2472,7 +2320,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Amplification of a pool has been scheduled to change.
      **/
     AmplificationChanging: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'AmplificationChanging',
       {
@@ -2487,13 +2334,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    PoolDestroyed: GenericPalletEvent<Rv, 'Stableswap', 'PoolDestroyed', { poolId: number }>;
+    PoolDestroyed: GenericPalletEvent<'Stableswap', 'PoolDestroyed', { poolId: number }>;
 
     /**
      * Pool peg source has been updated.
      **/
     PoolPegSourceUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolPegSourceUpdated',
       { poolId: number; assetId: number; pegSource: PalletStableswapPegSource }
@@ -2503,7 +2349,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool max peg update has been updated.
      **/
     PoolMaxPegUpdateUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolMaxPegUpdateUpdated',
       { poolId: number; maxPegUpdate: Perbill }
@@ -2512,7 +2357,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bonds`'s events
@@ -2522,7 +2367,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A bond asset was registered
      **/
     TokenCreated: GenericPalletEvent<
-      Rv,
       'Bonds',
       'TokenCreated',
       { issuer: AccountId32; assetId: number; bondId: number; maturity: bigint }
@@ -2531,22 +2375,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bond were issued
      **/
-    Issued: GenericPalletEvent<
-      Rv,
-      'Bonds',
-      'Issued',
-      { issuer: AccountId32; bondId: number; amount: bigint; fee: bigint }
-    >;
+    Issued: GenericPalletEvent<'Bonds', 'Issued', { issuer: AccountId32; bondId: number; amount: bigint; fee: bigint }>;
 
     /**
      * Bonds were redeemed
      **/
-    Redeemed: GenericPalletEvent<Rv, 'Bonds', 'Redeemed', { who: AccountId32; bondId: number; amount: bigint }>;
+    Redeemed: GenericPalletEvent<'Bonds', 'Redeemed', { who: AccountId32; bondId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OtcSettlements`'s events
@@ -2555,12 +2394,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A trade has been executed
      **/
-    Executed: GenericPalletEvent<Rv, 'OtcSettlements', 'Executed', { assetId: number; profit: bigint }>;
+    Executed: GenericPalletEvent<'OtcSettlements', 'Executed', { assetId: number; profit: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `LBP`'s events
@@ -2569,18 +2408,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pool was created by the `CreatePool` origin.
      **/
-    PoolCreated: GenericPalletEvent<Rv, 'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolCreated: GenericPalletEvent<'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * Pool data were updated.
      **/
-    PoolUpdated: GenericPalletEvent<Rv, 'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolUpdated: GenericPalletEvent<'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2590,7 +2428,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool and the pool was destroyed.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2601,7 +2438,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'SellExecuted',
       {
@@ -2620,7 +2456,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'BuyExecuted',
       {
@@ -2637,7 +2472,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYK`'s events
@@ -2647,7 +2482,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2657,7 +2491,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; shares: bigint }
@@ -2667,7 +2500,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolCreated',
       {
@@ -2684,7 +2516,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was destroyed.
      **/
     PoolDestroyed: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolDestroyed',
       { who: AccountId32; assetA: number; assetB: number; shareToken: number; pool: AccountId32 }
@@ -2695,7 +2526,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'SellExecuted',
       {
@@ -2715,7 +2545,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'BuyExecuted',
       {
@@ -2733,7 +2562,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referrals`'s events
@@ -2742,13 +2571,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Referral code has been registered.
      **/
-    CodeRegistered: GenericPalletEvent<Rv, 'Referrals', 'CodeRegistered', { code: Bytes; account: AccountId32 }>;
+    CodeRegistered: GenericPalletEvent<'Referrals', 'CodeRegistered', { code: Bytes; account: AccountId32 }>;
 
     /**
      * Referral code has been linked to an account.
      **/
     CodeLinked: GenericPalletEvent<
-      Rv,
       'Referrals',
       'CodeLinked',
       { account: AccountId32; code: Bytes; referralAccount: AccountId32 }
@@ -2758,7 +2586,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset has been converted to RewardAsset.
      **/
     Converted: GenericPalletEvent<
-      Rv,
       'Referrals',
       'Converted',
       { from: PalletReferralsAssetAmount; to: PalletReferralsAssetAmount }
@@ -2768,7 +2595,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards claimed.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Referrals',
       'Claimed',
       { who: AccountId32; referrerRewards: bigint; tradeRewards: bigint }
@@ -2778,7 +2604,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New asset rewards has been set.
      **/
     AssetRewardsUpdated: GenericPalletEvent<
-      Rv,
       'Referrals',
       'AssetRewardsUpdated',
       { assetId: number; level: PalletReferralsLevel; rewards: PalletReferralsFeeDistribution }
@@ -2787,12 +2612,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Referrer reached new level.
      **/
-    LevelUp: GenericPalletEvent<Rv, 'Referrals', 'LevelUp', { who: AccountId32; level: PalletReferralsLevel }>;
+    LevelUp: GenericPalletEvent<'Referrals', 'LevelUp', { who: AccountId32; level: PalletReferralsLevel }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Liquidation`'s events
@@ -2802,7 +2627,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Money market position has been liquidated
      **/
     Liquidated: GenericPalletEvent<
-      Rv,
       'Liquidation',
       'Liquidated',
       { user: H160; collateralAsset: number; debtAsset: number; debtToCover: bigint; profit: bigint }
@@ -2811,7 +2635,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `HSM`'s events
@@ -2829,7 +2653,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `buyback_rate`: Parameter that controls how quickly HSM can buy Hollar with this asset
      **/
     CollateralAdded: GenericPalletEvent<
-      Rv,
       'HSM',
       'CollateralAdded',
       {
@@ -2848,7 +2671,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parameters:
      * - `asset_id`: The ID of the asset removed from collaterals
      **/
-    CollateralRemoved: GenericPalletEvent<Rv, 'HSM', 'CollateralRemoved', { assetId: number }>;
+    CollateralRemoved: GenericPalletEvent<'HSM', 'CollateralRemoved', { assetId: number }>;
 
     /**
      * A collateral asset was updated
@@ -2859,9 +2682,9 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `max_buy_price_coefficient`: New max buy price coefficient if updated (None if not changed)
      * - `buy_back_fee`: New buy back fee if updated (None if not changed)
      * - `buyback_rate`: New buyback rate if updated (None if not changed)
+     * - `max_in_holding`: New max collateral holding if updated (None if not changed)
      **/
     CollateralUpdated: GenericPalletEvent<
-      Rv,
       'HSM',
       'CollateralUpdated',
       {
@@ -2870,6 +2693,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
         maxBuyPriceCoefficient?: FixedU128 | undefined;
         buyBackFee?: Permill | undefined;
         buybackRate?: Perbill | undefined;
+        maxInHolding?: bigint | undefined | undefined;
       }
     >;
 
@@ -2881,7 +2705,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `hollar_amount`: Amount of Hollar that was included in the arbitrage operation
      **/
     ArbitrageExecuted: GenericPalletEvent<
-      Rv,
       'HSM',
       'ArbitrageExecuted',
       { arbitrage: number; assetId: number; hollarAmount: bigint; profit: bigint }
@@ -2893,12 +2716,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parameters:
      * - `flash_minter`: The EVM address of the flash minter contract
      **/
-    FlashMinterSet: GenericPalletEvent<Rv, 'HSM', 'FlashMinterSet', { flashMinter: H160 }>;
+    FlashMinterSet: GenericPalletEvent<'HSM', 'FlashMinterSet', { flashMinter: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Tokens`'s events
@@ -2907,19 +2730,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Endowed: GenericPalletEvent<'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below
      * ExistentialDeposit, resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
     Transfer: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Transfer',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2928,24 +2750,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<
-      Rv,
-      'Tokens',
-      'Unreserved',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Unreserved: GenericPalletEvent<'Tokens', 'Unreserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some reserved balance was repatriated (moved from reserved to
      * another account).
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Tokens',
       'ReserveRepatriated',
       {
@@ -2961,7 +2777,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A balance was set by root.
      **/
     BalanceSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'BalanceSet',
       { currencyId: number; who: AccountId32; free: bigint; reserved: bigint }
@@ -2970,18 +2785,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The total issuance of an currency has been set
      **/
-    TotalIssuanceSet: GenericPalletEvent<Rv, 'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
+    TotalIssuanceSet: GenericPalletEvent<'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
 
     /**
      * Some balances were withdrawn (e.g. pay for transaction fee)
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balances were slashed (e.g. due to mis-behavior)
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Slashed',
       { currencyId: number; who: AccountId32; freeAmount: bigint; reservedAmount: bigint }
@@ -2990,13 +2804,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposited some balance into an account
      **/
-    Deposited: GenericPalletEvent<Rv, 'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some funds are locked
      **/
     LockSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockSet',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32; amount: bigint }
@@ -3006,7 +2819,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some locked funds were unlocked
      **/
     LockRemoved: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockRemoved',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32 }
@@ -3015,19 +2827,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some free balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some locked balance was freed.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
-    Issued: GenericPalletEvent<Rv, 'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
-    Rescinded: GenericPalletEvent<Rv, 'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Currencies`'s events
@@ -3037,7 +2849,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Currency transfer success.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Currencies',
       'Transferred',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -3047,7 +2858,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Update balance success.
      **/
     BalanceUpdated: GenericPalletEvent<
-      Rv,
       'Currencies',
       'BalanceUpdated',
       { currencyId: number; who: AccountId32; amount: bigint }
@@ -3056,27 +2866,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposit success.
      **/
-    Deposited: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Deposited',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Deposited: GenericPalletEvent<'Currencies', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Withdraw success.
      **/
-    Withdrawn: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Withdrawn',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Withdrawn: GenericPalletEvent<'Currencies', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -3086,7 +2886,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Added new vesting schedule.
      **/
     VestingScheduleAdded: GenericPalletEvent<
-      Rv,
       'Vesting',
       'VestingScheduleAdded',
       { from: AccountId32; to: AccountId32; vestingSchedule: OrmlVestingVestingSchedule }
@@ -3095,17 +2894,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Claimed vesting.
      **/
-    Claimed: GenericPalletEvent<Rv, 'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
+    Claimed: GenericPalletEvent<'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Updated vesting schedules.
      **/
-    VestingSchedulesUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
+    VestingSchedulesUpdated: GenericPalletEvent<'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVM`'s events
@@ -3114,32 +2913,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ethereum events from contracts.
      **/
-    Log: GenericPalletEvent<Rv, 'EVM', 'Log', { log: EthereumLog }>;
+    Log: GenericPalletEvent<'EVM', 'Log', { log: EthereumLog }>;
 
     /**
      * A contract has been created at given address.
      **/
-    Created: GenericPalletEvent<Rv, 'EVM', 'Created', { address: H160 }>;
+    Created: GenericPalletEvent<'EVM', 'Created', { address: H160 }>;
 
     /**
      * A contract was attempted to be created, but the execution failed.
      **/
-    CreatedFailed: GenericPalletEvent<Rv, 'EVM', 'CreatedFailed', { address: H160 }>;
+    CreatedFailed: GenericPalletEvent<'EVM', 'CreatedFailed', { address: H160 }>;
 
     /**
      * A contract has been executed successfully with states applied.
      **/
-    Executed: GenericPalletEvent<Rv, 'EVM', 'Executed', { address: H160 }>;
+    Executed: GenericPalletEvent<'EVM', 'Executed', { address: H160 }>;
 
     /**
      * A contract has been executed with errors. States are reverted with only gas fees applied.
      **/
-    ExecutedFailed: GenericPalletEvent<Rv, 'EVM', 'ExecutedFailed', { address: H160 }>;
+    ExecutedFailed: GenericPalletEvent<'EVM', 'ExecutedFailed', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Ethereum`'s events
@@ -3149,7 +2948,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An ethereum transaction was successfully executed.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Ethereum',
       'Executed',
       { from: H160; to: H160; transactionHash: H256; exitReason: EvmCoreErrorExitReason; extraData: Bytes }
@@ -3158,7 +2956,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVMAccounts`'s events
@@ -3167,32 +2965,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Binding was created.
      **/
-    Bound: GenericPalletEvent<Rv, 'EVMAccounts', 'Bound', { account: AccountId32; address: H160 }>;
+    Bound: GenericPalletEvent<'EVMAccounts', 'Bound', { account: AccountId32; address: H160 }>;
 
     /**
      * Deployer was added.
      **/
-    DeployerAdded: GenericPalletEvent<Rv, 'EVMAccounts', 'DeployerAdded', { who: H160 }>;
+    DeployerAdded: GenericPalletEvent<'EVMAccounts', 'DeployerAdded', { who: H160 }>;
 
     /**
      * Deployer was removed.
      **/
-    DeployerRemoved: GenericPalletEvent<Rv, 'EVMAccounts', 'DeployerRemoved', { who: H160 }>;
+    DeployerRemoved: GenericPalletEvent<'EVMAccounts', 'DeployerRemoved', { who: H160 }>;
 
     /**
      * Contract was approved.
      **/
-    ContractApproved: GenericPalletEvent<Rv, 'EVMAccounts', 'ContractApproved', { address: H160 }>;
+    ContractApproved: GenericPalletEvent<'EVMAccounts', 'ContractApproved', { address: H160 }>;
 
     /**
      * Contract was disapproved.
      **/
-    ContractDisapproved: GenericPalletEvent<Rv, 'EVMAccounts', 'ContractDisapproved', { address: H160 }>;
+    ContractDisapproved: GenericPalletEvent<'EVMAccounts', 'ContractDisapproved', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKLiquidityMining`'s events
@@ -3202,7 +3000,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New global farm was created.
      **/
     GlobalFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmCreated',
       {
@@ -3224,7 +3021,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm's `price_adjustment` was updated.
      **/
     GlobalFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmUpdated',
       { id: number; priceAdjustment: FixedU128 }
@@ -3234,7 +3030,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New yield farm was added into the farm.
      **/
     YieldFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmCreated',
       {
@@ -3250,7 +3045,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was terminated.
      **/
     GlobalFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmTerminated',
       { globalFarmId: number; who: AccountId32; rewardCurrency: number; undistributedRewards: bigint }
@@ -3260,7 +3054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New LP tokens was deposited.
      **/
     SharesDeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesDeposited',
       {
@@ -3277,7 +3070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP token was redeposited for a new yield farm entry
      **/
     SharesRedeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesRedeposited',
       {
@@ -3294,7 +3086,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards was claimed.
      **/
     RewardClaimed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'RewardClaimed',
       {
@@ -3311,7 +3102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP tokens was withdrawn.
      **/
     SharesWithdrawn: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesWithdrawn',
       {
@@ -3328,7 +3118,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was stopped.
      **/
     YieldFarmStopped: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmStopped',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -3338,7 +3127,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was resumed.
      **/
     YieldFarmResumed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmResumed',
       {
@@ -3354,7 +3142,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm was terminated from global farm.
      **/
     YieldFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmTerminated',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -3364,7 +3151,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm multiplier was updated.
      **/
     YieldFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmUpdated',
       {
@@ -3380,7 +3166,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NFT representing deposit has been destroyed
      **/
     DepositDestroyed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'DepositDestroyed',
       { who: AccountId32; depositId: bigint }
@@ -3389,7 +3174,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKWarehouseLM`'s events
@@ -3399,7 +3184,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm accumulated reward per share was updated.
      **/
     GlobalFarmAccRPZUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'GlobalFarmAccRPZUpdated',
       { globalFarmId: number; accumulatedRpz: FixedU128; totalSharesZ: bigint }
@@ -3409,7 +3193,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm accumulated reward per valued share was updated.
      **/
     YieldFarmAccRPVSUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'YieldFarmAccRPVSUpdated',
       { globalFarmId: number; yieldFarmId: number; accumulatedRpvs: FixedU128; totalValuedShares: bigint }
@@ -3418,12 +3201,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Global farm has no more rewards to distribute in the moment.
      **/
-    AllRewardsDistributed: GenericPalletEvent<Rv, 'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
+    AllRewardsDistributed: GenericPalletEvent<'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RelayChainInfo`'s events
@@ -3434,7 +3217,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [ Parachain block number, Relaychain Block number ]
      **/
     CurrentBlockNumbers: GenericPalletEvent<
-      Rv,
       'RelayChainInfo',
       'CurrentBlockNumbers',
       { parachainBlockNumber: number; relaychainBlockNumber: number }
@@ -3443,7 +3225,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DCA`'s events
@@ -3452,13 +3234,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA execution is started
      **/
-    ExecutionStarted: GenericPalletEvent<Rv, 'DCA', 'ExecutionStarted', { id: number; block: number }>;
+    ExecutionStarted: GenericPalletEvent<'DCA', 'ExecutionStarted', { id: number; block: number }>;
 
     /**
      * The DCA is scheduled for next execution
      **/
     Scheduled: GenericPalletEvent<
-      Rv,
       'DCA',
       'Scheduled',
       { id: number; who: AccountId32; period: number; totalAmount: bigint; order: PalletDcaOrder }
@@ -3467,18 +3248,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA is planned for blocknumber
      **/
-    ExecutionPlanned: GenericPalletEvent<
-      Rv,
-      'DCA',
-      'ExecutionPlanned',
-      { id: number; who: AccountId32; block: number }
-    >;
+    ExecutionPlanned: GenericPalletEvent<'DCA', 'ExecutionPlanned', { id: number; who: AccountId32; block: number }>;
 
     /**
      * The DCA trade is successfully executed
      **/
     TradeExecuted: GenericPalletEvent<
-      Rv,
       'DCA',
       'TradeExecuted',
       { id: number; who: AccountId32; amountIn: bigint; amountOut: bigint }
@@ -3487,23 +3262,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA trade execution is failed
      **/
-    TradeFailed: GenericPalletEvent<Rv, 'DCA', 'TradeFailed', { id: number; who: AccountId32; error: DispatchError }>;
+    TradeFailed: GenericPalletEvent<'DCA', 'TradeFailed', { id: number; who: AccountId32; error: DispatchError }>;
 
     /**
      * The DCA is terminated and completely removed from the chain
      **/
-    Terminated: GenericPalletEvent<Rv, 'DCA', 'Terminated', { id: number; who: AccountId32; error: DispatchError }>;
+    Terminated: GenericPalletEvent<'DCA', 'Terminated', { id: number; who: AccountId32; error: DispatchError }>;
 
     /**
      * The DCA is completed and completely removed from the chain
      **/
-    Completed: GenericPalletEvent<Rv, 'DCA', 'Completed', { id: number; who: AccountId32 }>;
+    Completed: GenericPalletEvent<'DCA', 'Completed', { id: number; who: AccountId32 }>;
 
     /**
      * Randomness generation failed possibly coming from missing data about relay chain
      **/
     RandomnessGenerationFailed: GenericPalletEvent<
-      Rv,
       'DCA',
       'RandomnessGenerationFailed',
       { block: number; error: DispatchError }
@@ -3512,12 +3286,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * DCA reserve for the given asset have been unlocked for a user
      **/
-    ReserveUnlocked: GenericPalletEvent<Rv, 'DCA', 'ReserveUnlocked', { who: AccountId32; assetId: number }>;
+    ReserveUnlocked: GenericPalletEvent<'DCA', 'ReserveUnlocked', { who: AccountId32; assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -3526,18 +3300,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -3547,7 +3320,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -3557,7 +3329,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3567,7 +3338,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3577,7 +3347,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3588,7 +3357,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3598,7 +3366,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3607,7 +3374,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -3616,13 +3383,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -3631,18 +3397,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -3652,7 +3417,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -3661,7 +3425,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -3670,13 +3434,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
 
     /**
      * A XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -3693,7 +3456,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3704,7 +3466,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV4Response }
@@ -3715,7 +3476,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3727,7 +3487,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -3744,7 +3503,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3756,7 +3514,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3768,7 +3525,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV4Location; queryId: bigint; expectedLocation?: StagingXcmV4Location | undefined }
@@ -3784,7 +3540,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3793,13 +3548,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -3811,7 +3565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV4Location; result: number; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3822,7 +3575,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV4Location; version: number }
@@ -3833,7 +3585,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV4Location; queryId: bigint; error: XcmV3TraitsError }
@@ -3844,7 +3595,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -3860,7 +3610,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3872,7 +3621,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -3888,7 +3636,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3898,7 +3645,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3909,7 +3655,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3919,7 +3664,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV4Location; fees: StagingXcmV4AssetAssets }
@@ -3929,7 +3673,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -3938,12 +3681,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -3953,29 +3696,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV4TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV4TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -3984,12 +3722,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -3999,7 +3737,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -4027,7 +3764,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -4062,7 +3798,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -4092,7 +3827,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -4111,7 +3845,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OrmlXcm`'s events
@@ -4120,12 +3854,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * XCM message sent. \[to, message\]
      **/
-    Sent: GenericPalletEvent<Rv, 'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
+    Sent: GenericPalletEvent<'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XTokens`'s events
@@ -4135,7 +3869,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transferred `Asset` with fee.
      **/
     TransferredAssets: GenericPalletEvent<
-      Rv,
       'XTokens',
       'TransferredAssets',
       { sender: AccountId32; assets: StagingXcmV4AssetAssets; fee: StagingXcmV4Asset; dest: StagingXcmV4Location }
@@ -4144,7 +3877,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `UnknownTokens`'s events
@@ -4154,7 +3887,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deposit success.
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Deposited',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -4164,7 +3896,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdraw success.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Withdrawn',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -4173,7 +3904,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -4183,7 +3914,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -4192,18 +3922,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -4212,13 +3941,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -4228,7 +3956,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -4237,13 +3964,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -4254,7 +3980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -4263,7 +3988,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -4273,12 +3998,402 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `Ismp`'s events
+   **/
+  ismp: {
+    /**
+     * Emitted when a state machine is successfully updated to a new height
+     **/
+    StateMachineUpdated: GenericPalletEvent<
+      'Ismp',
+      'StateMachineUpdated',
+      {
+        /**
+         * State machine identifier
+         **/
+        stateMachineId: IsmpConsensusStateMachineId;
+
+        /**
+         * State machine latest height
+         **/
+        latestHeight: bigint;
+      }
+    >;
+
+    /**
+     * Emitted when a state commitment is vetoed by a fisherman
+     **/
+    StateCommitmentVetoed: GenericPalletEvent<
+      'Ismp',
+      'StateCommitmentVetoed',
+      {
+        /**
+         * State machine height
+         **/
+        height: IsmpConsensusStateMachineHeight;
+
+        /**
+         * responsible fisherman
+         **/
+        fisherman: Bytes;
+      }
+    >;
+
+    /**
+     * Indicates that a consensus client has been created
+     **/
+    ConsensusClientCreated: GenericPalletEvent<
+      'Ismp',
+      'ConsensusClientCreated',
+      {
+        /**
+         * Consensus client id
+         **/
+        consensusClientId: FixedBytes<4>;
+      }
+    >;
+
+    /**
+     * Indicates that a consensus client has been created
+     **/
+    ConsensusClientFrozen: GenericPalletEvent<
+      'Ismp',
+      'ConsensusClientFrozen',
+      {
+        /**
+         * Consensus client id
+         **/
+        consensusClientId: FixedBytes<4>;
+      }
+    >;
+
+    /**
+     * An Outgoing Response has been deposited
+     **/
+    Response: GenericPalletEvent<
+      'Ismp',
+      'Response',
+      {
+        /**
+         * Chain that this response will be routed to
+         **/
+        destChain: IsmpHostStateMachine;
+
+        /**
+         * Source Chain for this response
+         **/
+        sourceChain: IsmpHostStateMachine;
+
+        /**
+         * Nonce for the request which this response is for
+         **/
+        requestNonce: bigint;
+
+        /**
+         * Response Commitment
+         **/
+        commitment: H256;
+
+        /**
+         * Request commitment
+         **/
+        reqCommitment: H256;
+      }
+    >;
+
+    /**
+     * An Outgoing Request has been deposited
+     **/
+    Request: GenericPalletEvent<
+      'Ismp',
+      'Request',
+      {
+        /**
+         * Chain that this request will be routed to
+         **/
+        destChain: IsmpHostStateMachine;
+
+        /**
+         * Source Chain for request
+         **/
+        sourceChain: IsmpHostStateMachine;
+
+        /**
+         * Request nonce
+         **/
+        requestNonce: bigint;
+
+        /**
+         * Commitment
+         **/
+        commitment: H256;
+      }
+    >;
+
+    /**
+     * Some errors handling some ismp messages
+     **/
+    Errors: GenericPalletEvent<
+      'Ismp',
+      'Errors',
+      {
+        /**
+         * Message handling errors
+         **/
+        errors: Array<PalletIsmpErrorsHandlingError>;
+      }
+    >;
+
+    /**
+     * Post Request Handled
+     **/
+    PostRequestHandled: GenericPalletEvent<'Ismp', 'PostRequestHandled', IsmpEventsRequestResponseHandled>;
+
+    /**
+     * Post Response Handled
+     **/
+    PostResponseHandled: GenericPalletEvent<'Ismp', 'PostResponseHandled', IsmpEventsRequestResponseHandled>;
+
+    /**
+     * Get Response Handled
+     **/
+    GetRequestHandled: GenericPalletEvent<'Ismp', 'GetRequestHandled', IsmpEventsRequestResponseHandled>;
+
+    /**
+     * Post request timeout handled
+     **/
+    PostRequestTimeoutHandled: GenericPalletEvent<'Ismp', 'PostRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
+
+    /**
+     * Post response timeout handled
+     **/
+    PostResponseTimeoutHandled: GenericPalletEvent<'Ismp', 'PostResponseTimeoutHandled', IsmpEventsTimeoutHandled>;
+
+    /**
+     * Get request timeout handled
+     **/
+    GetRequestTimeoutHandled: GenericPalletEvent<'Ismp', 'GetRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `IsmpParachain`'s events
+   **/
+  ismpParachain: {
+    /**
+     * Parachains with the `para_ids` have been added to the whitelist
+     **/
+    ParachainsAdded: GenericPalletEvent<
+      'IsmpParachain',
+      'ParachainsAdded',
+      {
+        /**
+         * The parachains in question
+         **/
+        paraIds: Array<IsmpParachainParachainData>;
+      }
+    >;
+
+    /**
+     * Parachains with the `para_ids` have been removed from the whitelist
+     **/
+    ParachainsRemoved: GenericPalletEvent<
+      'IsmpParachain',
+      'ParachainsRemoved',
+      {
+        /**
+         * The parachains in question
+         **/
+        paraIds: Array<number>;
+      }
+    >;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `Hyperbridge`'s events
+   **/
+  hyperbridge: {
+    /**
+     * Hyperbridge governance has now updated it's host params on this chain.
+     **/
+    HostParamsUpdated: GenericPalletEvent<
+      'Hyperbridge',
+      'HostParamsUpdated',
+      {
+        /**
+         * The old host params
+         **/
+        old: PalletHyperbridgeVersionedHostParams;
+
+        /**
+         * The new host params
+         **/
+        new: PalletHyperbridgeVersionedHostParams;
+      }
+    >;
+
+    /**
+     * A relayer has withdrawn some fees
+     **/
+    RelayerFeeWithdrawn: GenericPalletEvent<
+      'Hyperbridge',
+      'RelayerFeeWithdrawn',
+      {
+        /**
+         * The amount that was withdrawn
+         **/
+        amount: bigint;
+
+        /**
+         * The withdrawal beneficiary
+         **/
+        account: AccountId32;
+      }
+    >;
+
+    /**
+     * Hyperbridge has withdrawn it's protocol revenue
+     **/
+    ProtocolRevenueWithdrawn: GenericPalletEvent<
+      'Hyperbridge',
+      'ProtocolRevenueWithdrawn',
+      {
+        /**
+         * The amount that was withdrawn
+         **/
+        amount: bigint;
+
+        /**
+         * The withdrawal beneficiary
+         **/
+        account: AccountId32;
+      }
+    >;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `TokenGateway`'s events
+   **/
+  tokenGateway: {
+    /**
+     * An asset has been teleported
+     **/
+    AssetTeleported: GenericPalletEvent<
+      'TokenGateway',
+      'AssetTeleported',
+      {
+        /**
+         * Source account
+         **/
+        from: AccountId32;
+
+        /**
+         * beneficiary account on destination
+         **/
+        to: H256;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        dest: IsmpHostStateMachine;
+
+        /**
+         * Request commitment
+         **/
+        commitment: H256;
+      }
+    >;
+
+    /**
+     * An asset has been received and transferred to the beneficiary's account
+     **/
+    AssetReceived: GenericPalletEvent<
+      'TokenGateway',
+      'AssetReceived',
+      {
+        /**
+         * beneficiary account on relaychain
+         **/
+        beneficiary: AccountId32;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        source: IsmpHostStateMachine;
+      }
+    >;
+
+    /**
+     * An asset has been refunded and transferred to the beneficiary's account
+     **/
+    AssetRefunded: GenericPalletEvent<
+      'TokenGateway',
+      'AssetRefunded',
+      {
+        /**
+         * beneficiary account on relaychain
+         **/
+        beneficiary: AccountId32;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        source: IsmpHostStateMachine;
+      }
+    >;
+
+    /**
+     * ERC6160 asset creation request dispatched to hyperbridge
+     **/
+    Erc6160AssetRegistrationDispatched: GenericPalletEvent<
+      'TokenGateway',
+      'ERC6160AssetRegistrationDispatched',
+      {
+        /**
+         * Request commitment
+         **/
+        commitment: H256;
+      }
+    >;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EmaOracle`'s events
@@ -4288,7 +4403,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was added to the whitelist.
      **/
     AddedToWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'AddedToWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -4298,7 +4412,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was removed from the whitelist.
      **/
     RemovedFromWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'RemovedFromWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -4307,7 +4420,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Broadcast`'s events
@@ -4324,7 +4437,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      **/
     Swapped3: GenericPalletEvent<
-      Rv,
       'Broadcast',
       'Swapped3',
       {
@@ -4342,6 +4454,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/hydration/index.d.ts b/packages/chaintypes/src/hydration/index.d.ts
index 0ed09408..b24fc4ce 100644
--- a/packages/chaintypes/src/hydration/index.d.ts
+++ b/packages/chaintypes/src/hydration/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { AccountId32 } from 'dedot/codecs';
 import type {
   HydradxRuntimeRuntimeCall,
@@ -45,26 +45,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameMetadataHashExtensionCheckMetadataHash,
     CumulusPrimitivesStorageWeightReclaimStorageWeightReclaim,
   ];
-}
-
-export interface VersionedHydrationApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: HydrationApi
- * @specVersion: 347
+ * @specVersion: 359
  **/
-export interface HydrationApi {
-  legacy: VersionedHydrationApi<RpcLegacy>;
-  v2: VersionedHydrationApi<RpcV2>;
+export interface HydrationApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/hydration/json-rpc.d.ts b/packages/chaintypes/src/hydration/json-rpc.d.ts
index 1ebdb23a..2c54ae0e 100644
--- a/packages/chaintypes/src/hydration/json-rpc.d.ts
+++ b/packages/chaintypes/src/hydration/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_unstable_body'
   | 'archive_unstable_call'
@@ -149,4 +149,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'web3_clientVersion'
   | 'web3_sha3'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/hydration/query.d.ts b/packages/chaintypes/src/hydration/query.d.ts
index 0a859152..84bae39a 100644
--- a/packages/chaintypes/src/hydration/query.d.ts
+++ b/packages/chaintypes/src/hydration/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -125,12 +125,17 @@ import type {
   SpCoreCryptoKeyTypeId,
   SpConsensusAuraSr25519AppSr25519Public,
   SpConsensusSlotsSlot,
+  IsmpConsensusStateCommitment,
+  IsmpConsensusStateMachineHeight,
+  IsmpConsensusStateMachineId,
+  PalletHyperbridgeVersionedHostParams,
+  IsmpHostStateMachine,
   PalletEmaOracleOracleEntry,
   HydradxTraitsOracleOraclePeriod,
   PalletBroadcastExecutionType,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -141,35 +146,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -177,7 +182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -185,28 +190,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -219,14 +224,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -243,21 +248,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -265,26 +270,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -295,7 +300,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -305,12 +310,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -321,14 +326,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -359,7 +364,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -370,7 +375,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -380,7 +385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -388,7 +393,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -396,12 +401,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -411,18 +416,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiTransactionPayment`'s storage queries
@@ -434,7 +439,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    accountCurrencyMap: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    accountCurrencyMap: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Curated list of currencies which fees can be paid mapped to corresponding fallback price
@@ -442,7 +447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencies: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencies: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      * Asset prices from the spot price provider or the fallback price if the price is not available. Updated at the beginning of every block.
@@ -450,19 +455,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencyPrice: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencyPrice: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    transactionCurrencyOverride: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    transactionCurrencyOverride: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -473,7 +478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -481,28 +486,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -510,12 +515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -527,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -535,19 +540,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -563,7 +568,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -575,7 +579,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -587,7 +591,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -597,7 +601,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -606,7 +610,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -621,7 +624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -634,12 +637,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -650,14 +653,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -667,14 +670,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -682,7 +685,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -692,7 +695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -703,7 +706,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -711,7 +714,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -721,10 +724,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -733,7 +733,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -741,7 +741,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -755,7 +755,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -763,7 +762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -774,7 +773,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -782,7 +781,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<HydradxRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -790,33 +789,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -829,11 +828,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -841,16 +836,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -863,7 +854,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -871,7 +861,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -883,7 +873,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
+    class: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -891,7 +881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -901,7 +891,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, bigint, bigint]) => [] | undefined,
       [AccountId32, bigint, bigint]
     >;
@@ -913,7 +902,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, bigint]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
 
     /**
      * The items in existence and their ownership details.
@@ -921,7 +910,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
+    asset: GenericStorageQuery<(arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
 
     /**
      * Metadata of a collection.
@@ -929,7 +918,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
+    classMetadataOf: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
 
     /**
      * Metadata of an item.
@@ -938,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletUniquesItemMetadata | undefined,
       [bigint, bigint]
     >;
@@ -950,7 +938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [bigint, bigint | undefined, Bytes]
     >;
@@ -962,7 +949,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => [bigint, AccountId32 | undefined] | undefined,
       [bigint, bigint]
     >;
@@ -973,12 +959,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    collectionMaxSupply: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -992,7 +978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -1001,7 +987,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -1010,12 +996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1029,7 +1015,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1042,12 +1027,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1058,7 +1043,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1066,7 +1051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1077,7 +1062,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1085,7 +1070,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1098,12 +1083,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1114,12 +1099,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dispatcher`'s storage queries
@@ -1129,24 +1114,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32> =} callback
      **/
-    aaveManagerAccount: GenericStorageQuery<Rv, () => AccountId32>;
+    aaveManagerAccount: GenericStorageQuery<() => AccountId32>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    extraGas: GenericStorageQuery<Rv, () => bigint>;
+    extraGas: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {Callback<EvmCoreErrorExitReason | undefined> =} callback
      **/
-    lastEvmCallExitReason: GenericStorageQuery<Rv, () => EvmCoreErrorExitReason | undefined>;
+    lastEvmCallExitReason: GenericStorageQuery<() => EvmCoreErrorExitReason | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRegistry`'s storage queries
@@ -1158,14 +1143,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetDetails | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
 
     /**
      * Next available asset id. This is sequential id assigned for each new registered asset.
      *
      * @param {Callback<number> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number>;
+    nextAssetId: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between asset name and asset id.
@@ -1173,7 +1158,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    assetIds: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    assetIds: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Native location of an asset.
@@ -1181,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<HydradxRuntimeXcmAssetLocation | undefined> =} callback
      **/
-    assetLocations: GenericStorageQuery<Rv, (arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
+    assetLocations: GenericStorageQuery<(arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
 
     /**
      * Non-native assets which transfer is banned.
@@ -1189,7 +1174,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    bannedAssets: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    bannedAssets: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Local asset for native location.
@@ -1198,7 +1183,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     locationAssets: GenericStorageQuery<
-      Rv,
       (arg: HydradxRuntimeXcmAssetLocation) => number | undefined,
       HydradxRuntimeXcmAssetLocation
     >;
@@ -1209,12 +1193,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    existentialDepositCounter: GenericStorageQuery<Rv, () => bigint>;
+    existentialDepositCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1226,12 +1210,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {PalletClaimsEthereumAddress} arg
      * @param {Callback<bigint> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
+    claims: GenericStorageQuery<(arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GenesisHistory`'s storage queries
@@ -1241,12 +1225,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGenesisHistoryChain> =} callback
      **/
-    previousChain: GenericStorageQuery<Rv, () => PalletGenesisHistoryChain>;
+    previousChain: GenericStorageQuery<() => PalletGenesisHistoryChain>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorRewards`'s storage queries
@@ -1258,12 +1242,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    collators: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32>, number>;
+    collators: GenericStorageQuery<(arg: number) => Array<AccountId32>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Omnipool`'s storage queries
@@ -1275,14 +1259,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletOmnipoolAssetState | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletOmnipoolAssetState | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletOmnipoolAssetState | undefined, number>;
 
     /**
      * Tradable state of hub asset.
      *
      * @param {Callback<PalletOmnipoolTradability> =} callback
      **/
-    hubAssetTradability: GenericStorageQuery<Rv, () => PalletOmnipoolTradability>;
+    hubAssetTradability: GenericStorageQuery<() => PalletOmnipoolTradability>;
 
     /**
      * LP positions. Maps NFT instance id to corresponding position
@@ -1290,19 +1274,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletOmnipoolPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPause`'s storage queries
@@ -1316,12 +1300,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedTransactions: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedTransactions: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Duster`'s storage queries
@@ -1333,26 +1317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    accountBlacklist: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
-
-    /**
-     * Account to take reward from.
-     *
-     * @param {Callback<AccountId32 | undefined> =} callback
-     **/
-    rewardAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
-
-    /**
-     * Account to send dust to.
-     *
-     * @param {Callback<AccountId32 | undefined> =} callback
-     **/
-    dustAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    accountWhitelist: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s storage queries
@@ -1363,20 +1333,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -1385,7 +1355,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [number, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [number, number, number]
     >;
@@ -1396,7 +1365,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -1404,12 +1373,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+    activeYieldFarm: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s storage queries
@@ -1421,12 +1390,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    omniPositionId: GenericStorageQuery<Rv, (arg: bigint) => bigint | undefined, bigint>;
+    omniPositionId: GenericStorageQuery<(arg: bigint) => bigint | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OTC`'s storage queries
@@ -1437,19 +1406,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextOrderId: GenericStorageQuery<Rv, () => number>;
+    nextOrderId: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletOtcOrder | undefined> =} callback
      **/
-    orders: GenericStorageQuery<Rv, (arg: number) => PalletOtcOrder | undefined, number>;
+    orders: GenericStorageQuery<(arg: number) => PalletOtcOrder | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CircuitBreaker`'s storage queries
@@ -1462,7 +1431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number]> =} callback
      **/
-    tradeVolumeLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number], number>;
+    tradeVolumeLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number], number>;
 
     /**
      * Trade volumes per asset
@@ -1471,7 +1440,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerTradeVolumeLimit | undefined> =} callback
      **/
     allowedTradeVolumeLimitPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerTradeVolumeLimit | undefined,
       number
     >;
@@ -1483,7 +1451,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityAddLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityAddLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Add liquidity volumes per asset
@@ -1492,7 +1460,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedAddLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1502,11 +1469,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletCircuitBreakerLockdownStatus | undefined> =} callback
      **/
-    assetLockdownState: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletCircuitBreakerLockdownStatus | undefined,
-      number
-    >;
+    assetLockdownState: GenericStorageQuery<(arg: number) => PalletCircuitBreakerLockdownStatus | undefined, number>;
 
     /**
      * Liquidity limits of assets for removing liquidity.
@@ -1515,7 +1478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityRemoveLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityRemoveLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Remove liquidity volumes per asset
@@ -1524,7 +1487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedRemoveLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1532,7 +1494,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Router`'s storage queries
@@ -1545,7 +1507,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<HydradxTraitsRouterTrade> | undefined> =} callback
      **/
     routes: GenericStorageQuery<
-      Rv,
       (arg: HydradxTraitsRouterAssetPair) => Array<HydradxTraitsRouterTrade> | undefined,
       HydradxTraitsRouterAssetPair
     >;
@@ -1553,7 +1514,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicFees`'s storage queries
@@ -1566,7 +1527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesFeeEntry | undefined> =} callback
      **/
-    assetFee: GenericStorageQuery<Rv, (arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
+    assetFee: GenericStorageQuery<(arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
 
     /**
      * Stores per-asset fee configuration (Fixed or Dynamic)
@@ -1574,16 +1535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesAssetFeeConfig | undefined> =} callback
      **/
-    assetFeeConfiguration: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletDynamicFeesAssetFeeConfig | undefined,
-      number
-    >;
+    assetFeeConfiguration: GenericStorageQuery<(arg: number) => PalletDynamicFeesAssetFeeConfig | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -1594,7 +1551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingStakingData> =} callback
      **/
-    staking: GenericStorageQuery<Rv, () => PalletStakingStakingData>;
+    staking: GenericStorageQuery<() => PalletStakingStakingData>;
 
     /**
      * User's position state.
@@ -1602,14 +1559,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletStakingPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer.
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * List of position votes.
@@ -1617,7 +1574,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    votes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    votes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * List of processed vote. Used to determine if the vote should be locked in case of voting not in favor.
@@ -1626,7 +1583,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     votesRewarded: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1637,7 +1593,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    positionVotes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    positionVotes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * Legacy storage! - Used to handle democracy processed votes until democracy pallet is fully removed.
@@ -1646,7 +1602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     processedVotes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1656,12 +1611,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sixSecBlocksSince: GenericStorageQuery<Rv, () => number>;
+    sixSecBlocksSince: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Stableswap`'s storage queries
@@ -1673,7 +1628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletStableswapPoolInfo | undefined, number>;
 
     /**
      * Pool peg info.
@@ -1681,7 +1636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolPegInfo | undefined> =} callback
      **/
-    poolPegs: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
+    poolPegs: GenericStorageQuery<(arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
 
     /**
      * Tradability state of pool assets.
@@ -1689,7 +1644,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletStableswapTradability> =} callback
      **/
-    assetTradability: GenericStorageQuery<Rv, (arg: [number, number]) => PalletStableswapTradability, [number, number]>;
+    assetTradability: GenericStorageQuery<(arg: [number, number]) => PalletStableswapTradability, [number, number]>;
 
     /**
      * Temporary pool state storage. Used to save a state of pool in a single block.
@@ -1697,12 +1652,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolSnapshot | undefined> =} callback
      **/
-    poolSnapshots: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
+    poolSnapshots: GenericStorageQuery<(arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bonds`'s storage queries
@@ -1715,7 +1670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, bigint]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    bondIds: GenericStorageQuery<Rv, (arg: [number, bigint]) => number | undefined, [number, bigint]>;
+    bondIds: GenericStorageQuery<(arg: [number, bigint]) => number | undefined, [number, bigint]>;
 
     /**
      * Registered bonds.
@@ -1724,12 +1679,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, bigint] | undefined> =} callback
      **/
-    bonds: GenericStorageQuery<Rv, (arg: number) => [number, bigint] | undefined, number>;
+    bonds: GenericStorageQuery<(arg: number) => [number, bigint] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `LBP`'s storage queries
@@ -1741,7 +1696,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletLbpPool | undefined> =} callback
      **/
-    poolData: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
+    poolData: GenericStorageQuery<(arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
 
     /**
      * Storage used for tracking existing fee collectors
@@ -1750,12 +1705,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<boolean> =} callback
      **/
-    feeCollectorWithAsset: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
+    feeCollectorWithAsset: GenericStorageQuery<(arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYK`'s storage queries
@@ -1767,7 +1722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    shareToken: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    shareToken: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total liquidity in a pool.
@@ -1775,7 +1730,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalLiquidity: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    totalLiquidity: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Asset pair in a pool.
@@ -1783,12 +1738,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    poolAssets: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
+    poolAssets: GenericStorageQuery<(arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referrals`'s storage queries
@@ -1801,7 +1756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    referralCodes: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    referralCodes: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Referral accounts
@@ -1810,7 +1765,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    referralAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    referralAccounts: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * Linked accounts.
@@ -1819,7 +1774,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    linkedAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    linkedAccounts: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Shares of a referral account
@@ -1827,7 +1782,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    referrerShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    referrerShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Shares of a trader account
@@ -1835,14 +1790,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    traderShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    traderShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Total share issuance.
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalShares: GenericStorageQuery<Rv, () => bigint>;
+    totalShares: GenericStorageQuery<() => bigint>;
 
     /**
      * Referer level and total accumulated rewards over time.
@@ -1852,11 +1807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[PalletReferralsLevel, bigint] | undefined> =} callback
      **/
-    referrer: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined,
-      AccountId32
-    >;
+    referrer: GenericStorageQuery<(arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined, AccountId32>;
 
     /**
      * Asset fee distribution rewards information.
@@ -1866,7 +1817,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferralsFeeDistribution | undefined> =} callback
      **/
     assetRewards: GenericStorageQuery<
-      Rv,
       (arg: [number, PalletReferralsLevel]) => PalletReferralsFeeDistribution | undefined,
       [number, PalletReferralsLevel]
     >;
@@ -1878,19 +1828,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pendingConversions: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    pendingConversions: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingConversions: GenericStorageQuery<Rv, () => number>;
+    counterForPendingConversions: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Liquidation`'s storage queries
@@ -1901,12 +1851,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H160> =} callback
      **/
-    borrowingContract: GenericStorageQuery<Rv, () => H160>;
+    borrowingContract: GenericStorageQuery<() => H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `HSM`'s storage queries
@@ -1922,7 +1872,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletHsmCollateralInfo | undefined> =} callback
      **/
-    collaterals: GenericStorageQuery<Rv, (arg: number) => PalletHsmCollateralInfo | undefined, number>;
+    collaterals: GenericStorageQuery<(arg: number) => PalletHsmCollateralInfo | undefined, number>;
 
     /**
      * Amount of Hollar bought with an asset in a single block
@@ -1934,19 +1884,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    hollarAmountReceived: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    hollarAmountReceived: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Address of the flash loan receiver.
      *
      * @param {Callback<H160 | undefined> =} callback
      **/
-    flashMinter: GenericStorageQuery<Rv, () => H160 | undefined>;
+    flashMinter: GenericStorageQuery<() => H160 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1956,12 +1906,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    isTestnet: GenericStorageQuery<Rv, () => boolean>;
+    isTestnet: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tokens`'s storage queries
@@ -1973,7 +1923,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    totalIssuance: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Any liquidity locks of a token type under an account.
@@ -1982,11 +1932,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<Array<OrmlTokensBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>,
-      [AccountId32, number]
-    >;
+    locks: GenericStorageQuery<(arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>, [AccountId32, number]>;
 
     /**
      * The balance of a token type under an account.
@@ -1999,7 +1945,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<OrmlTokensAccountData> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
+    accounts: GenericStorageQuery<(arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
 
     /**
      * Named reserves on some account balances.
@@ -2008,7 +1954,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<OrmlTokensReserveData>> =} callback
      **/
     reserves: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => Array<OrmlTokensReserveData>,
       [AccountId32, number]
     >;
@@ -2016,7 +1961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2030,12 +1975,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<OrmlVestingVestingSchedule>> =} callback
      **/
-    vestingSchedules: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
+    vestingSchedules: GenericStorageQuery<(arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -2046,33 +1991,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    suicided: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    suicided: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMChainId`'s storage queries
@@ -2083,12 +2028,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    chainId: GenericStorageQuery<Rv, () => bigint>;
+    chainId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -2101,7 +2046,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined,
       number
     >;
@@ -2111,40 +2055,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMAccounts`'s storage queries
@@ -2156,7 +2100,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<FixedBytes<12> | undefined> =} callback
      **/
-    accountExtension: GenericStorageQuery<Rv, (arg: H160) => FixedBytes<12> | undefined, H160>;
+    accountExtension: GenericStorageQuery<(arg: H160) => FixedBytes<12> | undefined, H160>;
 
     /**
      * Whitelisted addresses that are allowed to deploy smart contracts.
@@ -2164,7 +2108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    contractDeployer: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    contractDeployer: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Whitelisted contracts that are allowed to manage balances and tokens.
@@ -2172,12 +2116,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    approvedContract: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    approvedContract: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicEvmFee`'s storage queries
@@ -2188,12 +2132,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
+    baseFeePerGas: GenericStorageQuery<() => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYKWarehouseLM`'s storage queries
@@ -2204,20 +2148,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -2226,7 +2170,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [AccountId32, number, number]
     >;
@@ -2237,7 +2180,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData002 | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -2245,16 +2188,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => number | undefined,
-      [AccountId32, number]
-    >;
+    activeYieldFarm: GenericStorageQuery<(arg: [AccountId32Like, number]) => number | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DCA`'s storage queries
@@ -2265,7 +2204,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    scheduleIdSequencer: GenericStorageQuery<Rv, () => number>;
+    scheduleIdSequencer: GenericStorageQuery<() => number>;
 
     /**
      * Storing schedule details
@@ -2273,7 +2212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDcaSchedule | undefined> =} callback
      **/
-    schedules: GenericStorageQuery<Rv, (arg: number) => PalletDcaSchedule | undefined, number>;
+    schedules: GenericStorageQuery<(arg: number) => PalletDcaSchedule | undefined, number>;
 
     /**
      * Storing schedule ownership
@@ -2281,11 +2220,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    scheduleOwnership: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    scheduleOwnership: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * Keep tracking the remaining amounts to spend for DCA schedules
@@ -2293,7 +2228,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    remainingAmounts: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    remainingAmounts: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Keep tracking the retry on error flag for DCA schedules
@@ -2301,7 +2236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    retriesOnError: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    retriesOnError: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Keep tracking the blocknumber when the schedule is planned to be executed
@@ -2309,7 +2244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    scheduleExecutionBlock: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    scheduleExecutionBlock: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Keep tracking of the schedule ids to be executed in the block
@@ -2317,12 +2252,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    scheduleIdsPerBlock: GenericStorageQuery<Rv, (arg: number) => Array<number>, number>;
+    scheduleIdsPerBlock: GenericStorageQuery<(arg: number) => Array<number>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2332,7 +2267,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2340,7 +2275,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -2348,11 +2283,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2363,12 +2294,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -2384,7 +2315,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -2394,7 +2325,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -2408,7 +2338,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -2419,7 +2349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -2428,14 +2358,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -2444,7 +2374,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -2457,7 +2387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -2468,7 +2398,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -2480,7 +2410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -2494,7 +2424,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -2508,7 +2437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -2518,7 +2447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -2529,7 +2458,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -2540,7 +2468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -2549,7 +2477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -2558,7 +2486,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -2567,21 +2495,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -2589,7 +2517,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -2597,7 +2525,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -2605,7 +2533,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -2614,12 +2542,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -2629,12 +2557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -2645,7 +2573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -2653,7 +2581,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -2664,7 +2592,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -2672,7 +2600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -2681,7 +2609,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2693,7 +2620,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2706,7 +2632,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2718,14 +2643,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -2734,7 +2659,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -2746,7 +2670,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -2756,7 +2679,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -2769,7 +2692,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -2781,12 +2704,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV4Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV4Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV4Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -2804,7 +2727,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -2816,7 +2739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -2825,7 +2748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -2837,7 +2759,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2847,14 +2768,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -2863,7 +2784,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2871,7 +2791,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -2884,7 +2804,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -2894,7 +2813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -2903,7 +2822,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -2911,7 +2829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `UnknownTokens`'s storage queries
@@ -2927,7 +2845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     concreteFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, StagingXcmV4Location]) => bigint,
       [StagingXcmV4Location, StagingXcmV4Location]
     >;
@@ -2942,7 +2859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     abstractFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, BytesLike]) => bigint,
       [StagingXcmV4Location, Bytes]
     >;
@@ -2950,7 +2866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -2961,12 +2877,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -2977,7 +2893,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -2988,7 +2904,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -2996,7 +2912,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -3005,7 +2921,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -3014,12 +2930,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -3030,14 +2946,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -3045,7 +2961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -3053,7 +2969,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -3064,7 +2980,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -3072,11 +2988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<HydradxRuntimeOpaqueSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -3085,7 +2997,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -3093,7 +3004,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -3104,7 +3015,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -3113,12 +3024,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -3133,7 +3044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -3142,12 +3053,236 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `Ismp`'s storage queries
+   **/
+  ismp: {
+    /**
+     * Holds a map of state machine heights to their verified state commitments. These state
+     * commitments end up here after they are successfully verified by a `ConsensusClient`
+     *
+     * @param {IsmpConsensusStateMachineHeight} arg
+     * @param {Callback<IsmpConsensusStateCommitment | undefined> =} callback
+     **/
+    stateCommitments: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineHeight) => IsmpConsensusStateCommitment | undefined,
+      IsmpConsensusStateMachineHeight
+    >;
+
+    /**
+     * Holds a map of consensus state identifiers to their consensus state.
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<Bytes | undefined> =} callback
+     **/
+    consensusStates: GenericStorageQuery<(arg: FixedBytes<4>) => Bytes | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of consensus state identifier to it's associated consensus client identifier
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<FixedBytes<4> | undefined> =} callback
+     **/
+    consensusStateClient: GenericStorageQuery<(arg: FixedBytes<4>) => FixedBytes<4> | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of consensus state identifiers to their unbonding periods
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    unbondingPeriod: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of state machine Ids to their challenge periods
+     *
+     * @param {IsmpConsensusStateMachineId} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    challengePeriod: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineId) => bigint | undefined,
+      IsmpConsensusStateMachineId
+    >;
+
+    /**
+     * Holds a map of consensus clients frozen due to byzantine
+     * behaviour
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    frozenConsensusClients: GenericStorageQuery<(arg: FixedBytes<4>) => boolean, FixedBytes<4>>;
+
+    /**
+     * The latest verified height for a state machine
+     *
+     * @param {IsmpConsensusStateMachineId} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    latestStateMachineHeight: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineId) => bigint | undefined,
+      IsmpConsensusStateMachineId
+    >;
+
+    /**
+     * Holds the timestamp at which a consensus client was recently updated.
+     * Used in ensuring that the configured challenge period elapses.
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    consensusClientUpdateTime: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+
+    /**
+     * Holds the timestamp at which a state machine height was updated.
+     * Used in ensuring that the configured challenge period elapses.
+     *
+     * @param {IsmpConsensusStateMachineHeight} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    stateMachineUpdateTime: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineHeight) => bigint | undefined,
+      IsmpConsensusStateMachineHeight
+    >;
+
+    /**
+     * Tracks requests that have been responded to
+     * The key is the request commitment
+     *
+     * @param {H256} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    responded: GenericStorageQuery<(arg: H256) => boolean, H256>;
+
+    /**
+     * Latest nonce for messages sent from this chain
+     *
+     * @param {Callback<bigint> =} callback
+     **/
+    nonce: GenericStorageQuery<() => bigint>;
+
+    /**
+     * The child trie root of messages
+     *
+     * @param {Callback<H256> =} callback
+     **/
+    childTrieRoot: GenericStorageQuery<() => H256>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `IsmpParachain`'s storage queries
+   **/
+  ismpParachain: {
+    /**
+     * Mapping of relay chain heights to it's state commitment. The state commitment of the parent
+     * relay block is inserted at every block in `on_finalize`. This commitment is gotten from
+     * parachain-system.
+     *
+     * @param {number} arg
+     * @param {Callback<H256 | undefined> =} callback
+     **/
+    relayChainStateCommitments: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
+
+    /**
+     * Tracks whether we've already seen the `update_parachain_consensus` inherent
+     *
+     * @param {Callback<boolean | undefined> =} callback
+     **/
+    consensusUpdated: GenericStorageQuery<() => boolean | undefined>;
+
+    /**
+     * List of parachains that this state machine is interested in.
+     *
+     * @param {number} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    parachains: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `Hyperbridge`'s storage queries
+   **/
+  hyperbridge: {
+    /**
+     * The host parameters of the pallet-hyperbridge.
+     *
+     * @param {Callback<PalletHyperbridgeVersionedHostParams> =} callback
+     **/
+    hostParams: GenericStorageQuery<() => PalletHyperbridgeVersionedHostParams>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `TokenGateway`'s storage queries
+   **/
+  tokenGateway: {
+    /**
+     * Assets supported by this instance of token gateway
+     * A map of the local asset id to the token gateway asset id
+     *
+     * @param {number} arg
+     * @param {Callback<H256 | undefined> =} callback
+     **/
+    supportedAssets: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
+
+    /**
+     * Assets that originate from this chain
+     *
+     * @param {number} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    nativeAssets: GenericStorageQuery<(arg: number) => boolean, number>;
+
+    /**
+     * Assets supported by this instance of token gateway
+     * A map of the token gateway asset id to the local asset id
+     *
+     * @param {H256} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    localAssets: GenericStorageQuery<(arg: H256) => number | undefined, H256>;
+
+    /**
+     * The decimals used by the EVM counterpart of this asset
+     *
+     * @param {[number, IsmpHostStateMachine]} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    precisions: GenericStorageQuery<
+      (arg: [number, IsmpHostStateMachine]) => number | undefined,
+      [number, IsmpHostStateMachine]
+    >;
+
+    /**
+     * The token gateway adresses on different chains
+     *
+     * @param {IsmpHostStateMachine} arg
+     * @param {Callback<Bytes | undefined> =} callback
+     **/
+    tokenGatewayAddresses: GenericStorageQuery<(arg: IsmpHostStateMachine) => Bytes | undefined, IsmpHostStateMachine>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmaOracle`'s storage queries
@@ -3158,7 +3293,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>> =} callback
      **/
-    accumulator: GenericStorageQuery<Rv, () => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
+    accumulator: GenericStorageQuery<() => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
 
     /**
      * Oracle storage keyed by data source, involved asset ids and the period length of the oracle.
@@ -3169,7 +3304,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletEmaOracleOracleEntry, number] | undefined> =} callback
      **/
     oracles: GenericStorageQuery<
-      Rv,
       (
         arg: [FixedBytes<8>, [number, number], HydradxTraitsOracleOraclePeriod],
       ) => [PalletEmaOracleOracleEntry, number] | undefined,
@@ -3181,12 +3315,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[FixedBytes<8>, [number, number]]>> =} callback
      **/
-    whitelistedAssets: GenericStorageQuery<Rv, () => Array<[FixedBytes<8>, [number, number]]>>;
+    whitelistedAssets: GenericStorageQuery<() => Array<[FixedBytes<8>, [number, number]]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broadcast`'s storage queries
@@ -3197,25 +3331,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    incrementalId: GenericStorageQuery<Rv, () => number>;
+    incrementalId: GenericStorageQuery<() => number>;
 
     /**
      * Execution context to figure out where the trade is originated from
      *
      * @param {Callback<Array<PalletBroadcastExecutionType>> =} callback
      **/
-    executionContext: GenericStorageQuery<Rv, () => Array<PalletBroadcastExecutionType>>;
+    executionContext: GenericStorageQuery<() => Array<PalletBroadcastExecutionType>>;
 
     /**
      * If filled, we overwrite the original swapper. Mainly used in router to not to use temporary trade account
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    swapper: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    swapper: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/hydration/runtime.d.ts b/packages/chaintypes/src/hydration/runtime.d.ts
index c54eeacc..d8ba02d7 100644
--- a/packages/chaintypes/src/hydration/runtime.d.ts
+++ b/packages/chaintypes/src/hydration/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -55,9 +55,16 @@ import type {
   XcmRuntimeApisConversionsError,
   HydradxTraitsOracleOraclePeriod,
   HydradxRuntimeEvmAaveTradeExecutorPoolData,
+  IsmpHostStateMachine,
+  IsmpEventsEvent,
+  IsmpConsensusStateMachineHeight,
+  IsmpConsensusStateMachineId,
+  IsmpRouterRequest,
+  IsmpRouterResponse,
+  CumulusPalletParachainSystemRelayChainState,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -67,7 +74,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -75,7 +82,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -83,12 +90,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -99,7 +106,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -110,7 +117,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -119,12 +126,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -140,7 +147,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FpSelfContainedUncheckedExtrinsic} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: FpSelfContainedUncheckedExtrinsic,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -151,7 +157,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -160,7 +166,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<FpSelfContainedUncheckedExtrinsic>>
     >;
 
@@ -172,14 +177,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -202,7 +206,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: FpSelfContainedUncheckedExtrinsic,
@@ -215,7 +218,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -227,12 +230,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -250,7 +253,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -261,14 +264,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
@@ -281,19 +283,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -308,12 +310,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CurrenciesApi - 0x9af86751b70c112d
@@ -326,7 +328,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} who
      **/
     account: GenericRuntimeApiMethod<
-      Rv,
       (assetId: number, who: AccountId32Like) => Promise<PalletCurrenciesRpcRuntimeApiAccountData>
     >;
 
@@ -336,7 +337,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} who
      **/
     accounts: GenericRuntimeApiMethod<
-      Rv,
       (who: AccountId32Like) => Promise<Array<[number, PalletCurrenciesRpcRuntimeApiAccountData]>>
     >;
 
@@ -346,12 +346,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} asset_id
      * @param {AccountId32Like} who
      **/
-    freeBalance: GenericRuntimeApiMethod<Rv, (assetId: number, who: AccountId32Like) => Promise<bigint>>;
+    freeBalance: GenericRuntimeApiMethod<(assetId: number, who: AccountId32Like) => Promise<bigint>>;
+
+    /**
+     *
+     * @callname: CurrenciesApi_minimum_balance
+     * @param {number} asset_id
+     **/
+    minimumBalance: GenericRuntimeApiMethod<(assetId: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -363,12 +370,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -381,7 +388,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -392,7 +398,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -401,19 +406,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EthereumRuntimeRPCApi - 0x582211f65bb14b89
@@ -424,7 +429,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_chain_id
      **/
-    chainId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    chainId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Returns pallet_evm::Accounts by address.
@@ -432,14 +437,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_basic
      * @param {H160} address
      **/
-    accountBasic: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<EvmBackendBasic>>;
+    accountBasic: GenericRuntimeApiMethod<(address: H160) => Promise<EvmBackendBasic>>;
 
     /**
      * Returns FixedGasPrice::min_gas_price
      *
      * @callname: EthereumRuntimeRPCApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * For a given account address, returns pallet_evm::AccountCodes.
@@ -447,14 +452,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_code_at
      * @param {H160} address
      **/
-    accountCodeAt: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    accountCodeAt: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Returns the converted FindAuthor::find_author authority id.
      *
      * @callname: EthereumRuntimeRPCApi_author
      **/
-    author: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    author: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * For a given account address and index, returns pallet_evm::AccountStorages.
@@ -463,7 +468,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} address
      * @param {U256} index
      **/
-    storageAt: GenericRuntimeApiMethod<Rv, (address: H160, index: U256) => Promise<H256>>;
+    storageAt: GenericRuntimeApiMethod<(address: H160, index: U256) => Promise<H256>>;
 
     /**
      *
@@ -480,7 +485,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -509,7 +513,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     create: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         data: BytesLike,
@@ -528,28 +531,27 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_current_block
      **/
-    currentBlock: GenericRuntimeApiMethod<Rv, () => Promise<EthereumBlock | undefined>>;
+    currentBlock: GenericRuntimeApiMethod<() => Promise<EthereumBlock | undefined>>;
 
     /**
      * Return the current receipt.
      *
      * @callname: EthereumRuntimeRPCApi_current_receipts
      **/
-    currentReceipts: GenericRuntimeApiMethod<Rv, () => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
+    currentReceipts: GenericRuntimeApiMethod<() => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
 
     /**
      * Return the current transaction status.
      *
      * @callname: EthereumRuntimeRPCApi_current_transaction_statuses
      **/
-    currentTransactionStatuses: GenericRuntimeApiMethod<Rv, () => Promise<Array<FpRpcTransactionStatus> | undefined>>;
+    currentTransactionStatuses: GenericRuntimeApiMethod<() => Promise<Array<FpRpcTransactionStatus> | undefined>>;
 
     /**
      *
      * @callname: EthereumRuntimeRPCApi_current_all
      **/
     currentAll: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<
         [
           EthereumBlock | undefined,
@@ -566,7 +568,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     extrinsicFilter: GenericRuntimeApiMethod<
-      Rv,
       (xts: Array<FpSelfContainedUncheckedExtrinsic>) => Promise<Array<EthereumTransactionTransactionV2>>
     >;
 
@@ -575,7 +576,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_elasticity
      **/
-    elasticity: GenericRuntimeApiMethod<Rv, () => Promise<Permill | undefined>>;
+    elasticity: GenericRuntimeApiMethod<() => Promise<Permill | undefined>>;
 
     /**
      * Used to determine if gas limit multiplier for non-transactional calls (eth_call/estimateGas)
@@ -583,7 +584,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_gas_limit_multiplier_support
      **/
-    gasLimitMultiplierSupport: GenericRuntimeApiMethod<Rv, () => Promise<[]>>;
+    gasLimitMultiplierSupport: GenericRuntimeApiMethod<() => Promise<[]>>;
 
     /**
      * Return the pending block.
@@ -592,7 +593,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     pendingBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         xts: Array<FpSelfContainedUncheckedExtrinsic>,
       ) => Promise<[EthereumBlock | undefined, Array<FpRpcTransactionStatus> | undefined]>
@@ -608,12 +608,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_initialize_pending_block
      * @param {Header} header
      **/
-    initializePendingBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    initializePendingBlock: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ConvertTransactionRuntimeApi - 0xe65b00e46cedd0aa
@@ -625,14 +625,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     convertTransaction: GenericRuntimeApiMethod<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => Promise<FpSelfContainedUncheckedExtrinsic>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EvmAccountsApi - 0x0bb67a52fcd040ff
@@ -644,7 +643,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_evm_address
      * @param {AccountId32Like} account_id
      **/
-    evmAddress: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<H160>>;
+    evmAddress: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<H160>>;
 
     /**
      * Return the Substrate address bound to the EVM account. If not bound, returns `None`.
@@ -652,7 +651,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_bound_account_id
      * @param {H160} evm_address
      **/
-    boundAccountId: GenericRuntimeApiMethod<Rv, (evmAddress: H160) => Promise<AccountId32 | undefined>>;
+    boundAccountId: GenericRuntimeApiMethod<(evmAddress: H160) => Promise<AccountId32 | undefined>>;
 
     /**
      * Get the Substrate address from the EVM address.
@@ -661,12 +660,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_account_id
      * @param {H160} evm_address
      **/
-    accountId: GenericRuntimeApiMethod<Rv, (evmAddress: H160) => Promise<AccountId32>>;
+    accountId: GenericRuntimeApiMethod<(evmAddress: H160) => Promise<AccountId32>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Erc20MappingApi - 0x542334fe4fd7cada
@@ -678,7 +677,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Erc20MappingApi_asset_address
      * @param {number} asset_id
      **/
-    assetAddress: GenericRuntimeApiMethod<Rv, (assetId: number) => Promise<H160>>;
+    assetAddress: GenericRuntimeApiMethod<(assetId: number) => Promise<H160>>;
 
     /**
      * Get the asset id corresponding to EVM address. If not found, returns `None`.
@@ -686,12 +685,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Erc20MappingApi_address_to_asset
      * @param {H160} address
      **/
-    addressToAsset: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number | undefined>>;
+    addressToAsset: GenericRuntimeApiMethod<(address: H160) => Promise<number | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -708,7 +707,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -723,7 +721,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -740,7 +737,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -759,7 +755,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -769,7 +764,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -791,12 +786,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -810,7 +805,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: HydradxRuntimeOriginCaller,
         call: HydradxRuntimeRuntimeCallLike,
@@ -825,7 +819,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -835,7 +828,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -848,14 +841,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ChainlinkAdapterApi - 0x2b5f5bcd2460e4f0
@@ -870,7 +862,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<8>} source
      **/
     encodeOracleAddress: GenericRuntimeApiMethod<
-      Rv,
       (
         assetIdA: number,
         assetIdB: number,
@@ -885,14 +876,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} oracle_address
      **/
     decodeOracleAddress: GenericRuntimeApiMethod<
-      Rv,
       (oracleAddress: H160) => Promise<[number, number, HydradxTraitsOracleOraclePeriod, FixedBytes<8>] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AaveTradeExecutor - 0xa2b2b484fcb86943
@@ -902,7 +892,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AaveTradeExecutor_pairs
      **/
-    pairs: GenericRuntimeApiMethod<Rv, () => Promise<Array<[number, number]>>>;
+    pairs: GenericRuntimeApiMethod<() => Promise<Array<[number, number]>>>;
 
     /**
      *
@@ -910,7 +900,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} asset_in
      * @param {number} asset_out
      **/
-    liquidityDepth: GenericRuntimeApiMethod<Rv, (assetIn: number, assetOut: number) => Promise<bigint | undefined>>;
+    liquidityDepth: GenericRuntimeApiMethod<(assetIn: number, assetOut: number) => Promise<bigint | undefined>>;
 
     /**
      *
@@ -919,7 +909,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} atoken
      **/
     pool: GenericRuntimeApiMethod<
-      Rv,
       (reserve: number, atoken: number) => Promise<HydradxRuntimeEvmAaveTradeExecutorPoolData>
     >;
 
@@ -927,12 +916,115 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AaveTradeExecutor_pools
      **/
-    pools: GenericRuntimeApiMethod<Rv, () => Promise<Array<HydradxRuntimeEvmAaveTradeExecutorPoolData>>>;
+    pools: GenericRuntimeApiMethod<() => Promise<Array<HydradxRuntimeEvmAaveTradeExecutorPoolData>>>;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: IsmpRuntimeApi - 0x0ebc8fd84ae20ada
+   **/
+  ismpRuntimeApi: {
+    /**
+     * Should return the host's state machine identifier
+     *
+     * @callname: IsmpRuntimeApi_host_state_machine
+     **/
+    hostStateMachine: GenericRuntimeApiMethod<() => Promise<IsmpHostStateMachine>>;
+
+    /**
+     * Fetch all ISMP events
+     *
+     * @callname: IsmpRuntimeApi_block_events
+     **/
+    blockEvents: GenericRuntimeApiMethod<() => Promise<Array<IsmpEventsEvent>>>;
+
+    /**
+     * Fetch all ISMP events and their extrinsic metadata
+     *
+     * @callname: IsmpRuntimeApi_block_events_with_metadata
+     **/
+    blockEventsWithMetadata: GenericRuntimeApiMethod<() => Promise<Array<[IsmpEventsEvent, number | undefined]>>>;
+
+    /**
+     * Return the scale encoded consensus state
+     *
+     * @callname: IsmpRuntimeApi_consensus_state
+     * @param {FixedBytes<4>} id
+     **/
+    consensusState: GenericRuntimeApiMethod<(id: FixedBytes<4>) => Promise<Bytes | undefined>>;
+
+    /**
+     * Return the timestamp this client was last updated in seconds
+     *
+     * @callname: IsmpRuntimeApi_state_machine_update_time
+     * @param {IsmpConsensusStateMachineHeight} id
+     **/
+    stateMachineUpdateTime: GenericRuntimeApiMethod<
+      (id: IsmpConsensusStateMachineHeight) => Promise<bigint | undefined>
+    >;
+
+    /**
+     * Return the challenge period timestamp
+     *
+     * @callname: IsmpRuntimeApi_challenge_period
+     * @param {IsmpConsensusStateMachineId} id
+     **/
+    challengePeriod: GenericRuntimeApiMethod<(id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>>;
+
+    /**
+     * Return the latest height of the state machine
+     *
+     * @callname: IsmpRuntimeApi_latest_state_machine_height
+     * @param {IsmpConsensusStateMachineId} id
+     **/
+    latestStateMachineHeight: GenericRuntimeApiMethod<(id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>>;
+
+    /**
+     * Fetch the requests for the given commitments.
+     *
+     * @callname: IsmpRuntimeApi_requests
+     * @param {Array<H256>} request_commitments
+     **/
+    requests: GenericRuntimeApiMethod<(requestCommitments: Array<H256>) => Promise<Array<IsmpRouterRequest>>>;
+
+    /**
+     * Fetch the responses for the given commitments.
+     *
+     * @callname: IsmpRuntimeApi_responses
+     * @param {Array<H256>} response_commitments
+     **/
+    responses: GenericRuntimeApiMethod<(responseCommitments: Array<H256>) => Promise<Array<IsmpRouterResponse>>>;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: IsmpParachainApi - 0x5d1df2fe7d4f6bc8
+   **/
+  ismpParachainApi: {
+    /**
+     * Return all the para_ids this runtime is interested in. Used by the inherent provider
+     *
+     * @callname: IsmpParachainApi_para_ids
+     **/
+    paraIds: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
+
+    /**
+     * Return the current relay chain state.
+     *
+     * @callname: IsmpParachainApi_current_relay_chain_state
+     **/
+    currentRelayChainState: GenericRuntimeApiMethod<() => Promise<CumulusPalletParachainSystemRelayChainState>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -952,7 +1044,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -973,7 +1065,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -983,11 +1075,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/hydration/tx.d.ts b/packages/chaintypes/src/hydration/tx.d.ts
index 9e1bc88a..8b3f99a2 100644
--- a/packages/chaintypes/src/hydration/tx.d.ts
+++ b/packages/chaintypes/src/hydration/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   AccountId32Like,
@@ -60,6 +58,7 @@ import type {
   PalletLbpWeightCurveType,
   PalletReferralsLevel,
   PalletReferralsFeeDistribution,
+  PalletHsmArbitrage,
   OrmlVestingVestingSchedule,
   EthereumTransactionTransactionV2,
   PalletXykAssetPair,
@@ -75,19 +74,32 @@ import type {
   CumulusPrimitivesCoreAggregateMessageOrigin,
   XcmVersionedAsset,
   HydradxRuntimeOpaqueSessionKeys,
+  IsmpMessagingMessage,
+  IsmpMessagingCreateConsensusState,
+  PalletIsmpUtilsUpdateConsensusState,
+  PalletIsmpUtilsFundMessageParams,
+  IsmpMessagingConsensusMessage,
+  IsmpParachainParachainData,
+  PalletTokenGatewayTeleportParams,
+  IsmpHostStateMachine,
+  PalletTokenGatewayAssetRegistration,
+  TokenGatewayPrimitivesGatewayAssetUpdate,
+  PalletTokenGatewayPrecisionUpdate,
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = HydradxRuntimeRuntimeCallLike,
-> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<HydradxRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -100,16 +112,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -119,16 +130,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -138,16 +148,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -160,16 +169,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -179,16 +187,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -198,16 +205,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -221,19 +227,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -243,16 +248,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -265,16 +269,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -291,16 +294,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -318,23 +320,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -364,23 +365,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -399,19 +399,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -424,20 +423,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -453,19 +451,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -490,19 +487,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -515,19 +511,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -544,16 +539,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -566,19 +560,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: AccountId32Like; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -593,19 +586,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -622,26 +614,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiTransactionPayment`'s transaction calls
@@ -665,16 +656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     setCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'SetCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -691,19 +681,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} price
      **/
     addCurrency: GenericTxCall<
-      Rv,
       (
         currency: number,
         price: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'AddCurrency';
             params: { currency: number; price: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -718,16 +707,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     removeCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'RemoveCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -741,16 +729,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} accountId
      **/
     resetPaymentCurrency: GenericTxCall<
-      Rv,
       (accountId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'ResetPaymentCurrency';
             params: { accountId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -771,7 +758,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} s
      **/
     dispatchPermit: GenericTxCall<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -783,7 +769,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         r: H256,
         s: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
@@ -800,14 +785,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               s: H256;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -836,19 +822,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -878,16 +863,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -925,21 +909,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: [],
         amount: bigint,
         beneficiary: AccountId32Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Spend';
             params: { assetKind: []; amount: bigint; beneficiary: AccountId32Like; validFrom: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -967,16 +950,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1004,16 +986,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1038,23 +1019,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1083,16 +1063,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1115,19 +1094,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1149,16 +1127,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1174,19 +1151,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: HydradxRuntimeOriginCaller,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: HydradxRuntimeOriginCaller; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1208,16 +1184,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1233,26 +1208,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: HydradxRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: HydradxRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -1267,16 +1241,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1291,16 +1264,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1313,16 +1285,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1334,16 +1305,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1355,23 +1325,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -1389,16 +1358,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1417,16 +1385,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1444,16 +1411,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1469,15 +1435,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1503,19 +1468,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1534,16 +1498,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1560,19 +1523,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1589,19 +1551,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1618,19 +1579,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1657,21 +1617,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: AccountId32Like,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: AccountId32Like; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1692,16 +1651,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1718,19 +1676,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1744,19 +1701,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1772,16 +1728,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1799,15 +1754,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1822,20 +1776,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: AccountId32Like,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: AccountId32Like; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1845,16 +1798,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (authority: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { authority: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1874,20 +1826,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetUsernameFor';
             params: { who: AccountId32Like; username: BytesLike; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1898,16 +1849,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1919,16 +1869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1938,16 +1887,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1958,23 +1906,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeDanglingUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveDanglingUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Democracy`'s transaction calls
@@ -1995,19 +1942,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     propose: GenericTxCall<
-      Rv,
       (
         proposal: FrameSupportPreimagesBounded,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Propose';
             params: { proposal: FrameSupportPreimagesBounded; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2022,16 +1968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposal
      **/
     second: GenericTxCall<
-      Rv,
       (proposal: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Second';
             params: { proposal: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2048,19 +1993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDemocracyVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         refIndex: number,
         vote: PalletDemocracyVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Vote';
             params: { refIndex: number; vote: PalletDemocracyVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2077,16 +2021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     emergencyCancel: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'EmergencyCancel';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2101,16 +2044,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalPropose: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalPropose';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2130,16 +2072,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeMajority: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeMajority';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2159,16 +2100,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeDefault: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeDefault';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2195,20 +2135,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     fastTrack: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         votingPeriod: number,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'FastTrack';
             params: { proposalHash: H256; votingPeriod: number; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2226,16 +2165,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     vetoExternal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'VetoExternal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2251,16 +2189,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     cancelReferendum: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelReferendum';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2291,20 +2228,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         to: AccountId32Like,
         conviction: PalletDemocracyConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Delegate';
             params: { to: AccountId32Like; conviction: PalletDemocracyConviction; balance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2324,15 +2260,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     undelegate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Undelegate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2345,15 +2280,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPublicProposals: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ClearPublicProposals';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2369,16 +2303,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Unlock';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2414,16 +2347,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveVote';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2448,19 +2380,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2485,19 +2416,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeRefIndex
      **/
     blacklist: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         maybeRefIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Blacklist';
             params: { proposalHash: H256; maybeRefIndex: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2513,16 +2443,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} propIndex
      **/
     cancelProposal: GenericTxCall<
-      Rv,
       (propIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelProposal';
             params: { propIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2547,19 +2476,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         owner: PalletDemocracyMetadataOwner,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'SetMetadata';
             params: { owner: PalletDemocracyMetadataOwner; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2584,26 +2512,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     forceRemoveVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ForceRemoveVote';
             params: { target: AccountId32Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommittee`'s transaction calls
@@ -2640,20 +2567,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2672,19 +2598,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: HydradxRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Execute';
             params: { proposal: HydradxRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2709,20 +2634,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: HydradxRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: HydradxRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2742,20 +2666,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2774,16 +2697,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2819,14 +2741,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
@@ -2838,14 +2758,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2867,13 +2788,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         forceProxyType: HydradxRuntimeSystemProxyType | undefined,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2884,7 +2803,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2904,20 +2824,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: AccountId32Like; proxyType: HydradxRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2935,20 +2854,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: AccountId32Like; proxyType: HydradxRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2962,15 +2880,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2999,20 +2916,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: HydradxRuntimeSystemProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3041,7 +2957,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
@@ -3049,7 +2964,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3062,7 +2976,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3087,19 +3002,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3119,19 +3033,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3151,19 +3064,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3186,14 +3098,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         real: AccountId32Like,
         forceProxyType: HydradxRuntimeSystemProxyType | undefined,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3205,14 +3115,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3236,19 +3147,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3300,7 +3210,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3308,7 +3217,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: HydradxRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3321,7 +3229,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3364,7 +3273,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3372,7 +3280,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3385,7 +3292,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3418,14 +3326,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3437,14 +3343,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -3472,19 +3379,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         admin: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: bigint; admin: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3512,20 +3418,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: bigint; owner: AccountId32Like; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3550,19 +3455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: bigint; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3584,20 +3488,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         owner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: bigint; item: bigint; owner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3623,20 +3526,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         checkOwner: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: bigint; item: bigint; checkOwner: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3664,20 +3566,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: bigint; item: bigint; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3704,19 +3605,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<bigint>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         items: Array<bigint>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: bigint; items: Array<bigint> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3736,19 +3636,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3768,19 +3667,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3798,16 +3696,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3825,16 +3722,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3855,19 +3751,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         newOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: bigint; newOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3891,21 +3786,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         issuer: AccountId32Like,
         admin: AccountId32Like,
         freezer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetTeam';
             params: { collection: bigint; issuer: AccountId32Like; admin: AccountId32Like; freezer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3930,20 +3824,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         delegate: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: bigint; item: bigint; delegate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3970,20 +3863,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         maybeCheckDelegate: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: bigint; item: bigint; maybeCheckDelegate: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4014,7 +3906,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
@@ -4024,7 +3915,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -4039,7 +3929,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4068,21 +3959,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4107,20 +3997,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4149,21 +4038,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: bigint; item: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4186,19 +4074,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4225,20 +4112,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4259,16 +4145,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4287,16 +4172,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: bigint | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4317,19 +4201,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: bigint; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4352,14 +4235,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         price: bigint | undefined,
         whitelistedBuyer: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -4371,7 +4252,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4391,27 +4273,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: bigint; item: bigint; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -4425,16 +4306,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4466,13 +4346,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -4483,7 +4361,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4497,19 +4376,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4526,20 +4404,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4549,16 +4426,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4577,26 +4453,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -4617,19 +4492,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4664,14 +4538,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: AccountId32Like,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -4683,7 +4555,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4706,16 +4579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4734,19 +4606,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4785,19 +4656,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4824,20 +4694,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4862,27 +4731,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     forceRemoveVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'ForceRemoveVote';
             params: { target: AccountId32Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -4904,13 +4772,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: HydradxRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -4921,7 +4787,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4938,16 +4805,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4963,16 +4829,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4987,16 +4852,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5011,16 +4875,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5033,16 +4896,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5060,16 +4922,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5085,16 +4946,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5111,26 +4971,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -5141,16 +5000,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5159,16 +5017,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5179,20 +5036,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5201,23 +5057,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Dispatcher`'s transaction calls
@@ -5228,16 +5083,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAsTreasury: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchAsTreasury';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5246,16 +5100,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAsAaveManager: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchAsAaveManager';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5270,16 +5123,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     noteAaveManager: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'NoteAaveManager';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5293,19 +5145,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} extraGas
      **/
     dispatchWithExtraGas: GenericTxCall<
-      Rv,
       (
         call: HydradxRuntimeRuntimeCallLike,
         extraGas: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchWithExtraGas';
             params: { call: HydradxRuntimeRuntimeCallLike; extraGas: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5323,23 +5174,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchEvmCall: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchEvmCall';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRegistry`'s transaction calls
@@ -5370,7 +5220,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isSufficient
      **/
     register: GenericTxCall<
-      Rv,
       (
         assetId: number | undefined,
         name: BytesLike | undefined,
@@ -5382,7 +5231,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         xcmRateLimit: bigint | undefined,
         isSufficient: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -5399,7 +5247,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isSufficient: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5426,7 +5275,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeXcmAssetLocation | undefined} location
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetId: number,
         name: BytesLike | undefined,
@@ -5438,7 +5286,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number | undefined,
         location: HydradxRuntimeXcmAssetLocation | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -5455,7 +5302,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               location: HydradxRuntimeXcmAssetLocation | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5464,16 +5312,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeXcmAssetLocation} location
      **/
     registerExternal: GenericTxCall<
-      Rv,
       (location: HydradxRuntimeXcmAssetLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'RegisterExternal';
             params: { location: HydradxRuntimeXcmAssetLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5482,16 +5329,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     banAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'BanAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5500,23 +5346,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     unbanAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'UnbanAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -5528,23 +5373,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (ethereumSignature: PalletClaimsEcdsaSignature) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { ethereumSignature: PalletClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `GenesisHistory`'s transaction calls
@@ -5553,7 +5397,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Omnipool`'s transaction calls
@@ -5583,21 +5427,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} positionOwner
      **/
     addToken: GenericTxCall<
-      Rv,
       (
         asset: number,
         initialPrice: FixedU128,
         weightCap: Permill,
         positionOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddToken';
             params: { asset: number; initialPrice: FixedU128; weightCap: Permill; positionOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5627,19 +5470,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddLiquidity';
             params: { asset: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5673,20 +5515,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minSharesLimit
      **/
     addLiquidityWithLimit: GenericTxCall<
-      Rv,
       (
         asset: number,
         amount: bigint,
         minSharesLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddLiquidityWithLimit';
             params: { asset: number; amount: bigint; minSharesLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5715,19 +5556,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { positionId: bigint; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5760,20 +5600,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minLimit
      **/
     removeLiquidityWithLimit: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
         minLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveLiquidityWithLimit';
             params: { positionId: bigint; amount: bigint; minLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5789,16 +5628,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     sacrificePosition: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SacrificePosition';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5827,21 +5665,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBuyAmount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amount: bigint,
         minBuyAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; minBuyAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5870,21 +5707,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxSellAmount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
         amount: bigint,
         maxSellAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxSellAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5902,19 +5738,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletOmnipoolTradability} state
      **/
     setAssetTradableState: GenericTxCall<
-      Rv,
       (
         assetId: number,
         state: PalletOmnipoolTradability,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SetAssetTradableState';
             params: { assetId: number; state: PalletOmnipoolTradability };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5934,20 +5769,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} recipient
      **/
     refundRefusedAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         recipient: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RefundRefusedAsset';
             params: { assetId: number; amount: bigint; recipient: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5965,19 +5799,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} cap
      **/
     setAssetWeightCap: GenericTxCall<
-      Rv,
       (
         assetId: number,
         cap: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SetAssetWeightCap';
             params: { assetId: number; cap: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6000,21 +5833,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     withdrawProtocolLiquidity: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         price: [bigint, bigint],
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'WithdrawProtocolLiquidity';
             params: { assetId: number; amount: bigint; price: [bigint, bigint]; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6035,26 +5867,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     removeToken: GenericTxCall<
-      Rv,
       (
         assetId: number,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveToken';
             params: { assetId: number; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TransactionPause`'s transaction calls
@@ -6066,19 +5897,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     pauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'PauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6088,26 +5918,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     unpauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'UnpauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Duster`'s transaction calls
@@ -6116,74 +5945,83 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Dust specified account.
      * IF account balance is < min. existential deposit of given currency, and account is allowed to
-     * be dusted, the remaining balance is transferred to selected account (usually treasury).
+     * be dusted, the remaining balance is transferred to treasury account.
      *
-     * Caller is rewarded with chosen reward in native currency.
+     * In case of AToken, we perform an erc20 dust, which does a wihtdraw all then supply atoken on behalf of the dust receiver
+     *
+     * The transaction fee is returned back in case of successful dusting.
+     *
+     * Treasury account can never be dusted.
+     *
+     * Emits `Dusted` event when successful.
      *
      * @param {AccountId32Like} account
      * @param {number} currencyId
      **/
     dustAccount: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         currencyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'DustAccount';
             params: { account: AccountId32Like; currencyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
-     * Add account to list of non-dustable account. Account whihc are excluded from udsting.
-     * If such account should be dusted - `AccountBlacklisted` error is returned.
+     * Add account to list of whitelist accounts. Account which are excluded from dusting.
+     * If such account should be dusted - `AccountWhitelisted` error is returned.
      * Only root can perform this action.
      *
+     * Emits `Added` event when successful.
+     *
+     *
      * @param {AccountId32Like} account
      **/
-    addNondustableAccount: GenericTxCall<
-      Rv,
+    whitelistAccount: GenericTxCall<
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
-            name: 'AddNondustableAccount';
+            name: 'WhitelistAccount';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
-     * Remove account from list of non-dustable accounts. That means account can be dusted again.
+     * Remove account from list of whitelist accounts. That means account can be dusted again.
+     *
+     * Emits `Removed` event when successful.
+     *
      *
      * @param {AccountId32Like} account
      **/
-    removeNondustableAccount: GenericTxCall<
-      Rv,
+    removeFromWhitelist: GenericTxCall<
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
-            name: 'RemoveNondustableAccount';
+            name: 'RemoveFromWhitelist';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s transaction calls
@@ -6192,7 +6030,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s transaction calls
@@ -6238,7 +6076,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} lrnaPriceAdjustment
      **/
     createGlobalFarm: GenericTxCall<
-      Rv,
       (
         totalRewards: bigint,
         plannedYieldingPeriods: number,
@@ -6249,7 +6086,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minDeposit: bigint,
         lrnaPriceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6265,7 +6101,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lrnaPriceAdjustment: FixedU128;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6287,16 +6124,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} globalFarmId
      **/
     terminateGlobalFarm: GenericTxCall<
-      Rv,
       (globalFarmId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'TerminateGlobalFarm';
             params: { globalFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6326,14 +6162,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletLiquidityMiningLoyaltyCurve | undefined} loyaltyCurve
      **/
     createYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
         multiplier: FixedU128,
         loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6345,7 +6179,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6368,20 +6203,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     updateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'UpdateYieldFarm';
             params: { globalFarmId: number; assetId: number; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6407,19 +6241,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     stopYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'StopYieldFarm';
             params: { globalFarmId: number; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6450,21 +6283,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     resumeYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetId: number,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ResumeYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetId: number; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6495,20 +6327,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     terminateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'TerminateYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6533,20 +6364,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     depositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         positionId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'DepositShares';
             params: { globalFarmId: number; yieldFarmId: number; positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6572,20 +6402,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} depositId
      **/
     redepositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         depositId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'RedepositShares';
             params: { globalFarmId: number; yieldFarmId: number; depositId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6607,19 +6436,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     claimRewards: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ClaimRewards';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6649,19 +6477,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     withdrawShares: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'WithdrawShares';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6687,14 +6514,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minDeposit
      **/
     updateGlobalFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         plannedYieldingPeriods: number,
         yieldPerPeriod: Perquintill,
         minDeposit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6706,7 +6531,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               minDeposit: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6725,19 +6551,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     joinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         positionId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'JoinFarms';
             params: { farmEntries: Array<[number, number]>; positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6760,14 +6585,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} minSharesLimit
      **/
     addLiquidityAndJoinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         asset: number,
         amount: bigint,
         minSharesLimit: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6779,7 +6602,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               minSharesLimit: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6804,19 +6628,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} yieldFarmIds
      **/
     exitFarms: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmIds: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ExitFarms';
             params: { depositId: bigint; yieldFarmIds: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6843,13 +6666,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, number]> | undefined} farmEntries
      **/
     addLiquidityStableswapOmnipoolAndJoinFarms: GenericTxCall<
-      Rv,
       (
         stablePoolId: number,
         stableAssetAmounts: Array<HydradxTraitsStableswapAssetAmount>,
         farmEntries: Array<[number, number]> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6860,14 +6681,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               farmEntries: Array<[number, number]> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OTC`'s transaction calls
@@ -6900,7 +6722,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} partiallyFillable
      **/
     placeOrder: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -6908,7 +6729,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountOut: bigint,
         partiallyFillable: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
@@ -6921,7 +6741,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               partiallyFillable: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6947,19 +6768,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountIn
      **/
     partialFillOrder: GenericTxCall<
-      Rv,
       (
         orderId: number,
         amountIn: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'PartialFillOrder';
             params: { orderId: number; amountIn: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6976,16 +6796,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} orderId
      **/
     fillOrder: GenericTxCall<
-      Rv,
       (orderId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'FillOrder';
             params: { orderId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7005,23 +6824,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} orderId
      **/
     cancelOrder: GenericTxCall<
-      Rv,
       (orderId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'CancelOrder';
             params: { orderId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CircuitBreaker`'s transaction calls
@@ -7042,19 +6860,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} tradeVolumeLimit
      **/
     setTradeVolumeLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         tradeVolumeLimit: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetTradeVolumeLimit';
             params: { assetId: number; tradeVolumeLimit: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7073,19 +6890,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number] | undefined} liquidityLimit
      **/
     setAddLiquidityLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         liquidityLimit: [number, number] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetAddLiquidityLimit';
             params: { assetId: number; liquidityLimit: [number, number] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7104,19 +6920,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number] | undefined} liquidityLimit
      **/
     setRemoveLiquidityLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         liquidityLimit: [number, number] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetRemoveLiquidityLimit';
             params: { assetId: number; liquidityLimit: [number, number] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7136,19 +6951,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} until
      **/
     lockdownAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         until: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'LockdownAsset';
             params: { assetId: number; until: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7167,16 +6981,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     forceLiftLockdown: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'ForceLiftLockdown';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7200,26 +7013,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     releaseDeposit: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'ReleaseDeposit';
             params: { who: AccountId32Like; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Router`'s transaction calls
@@ -7247,7 +7059,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7255,7 +7066,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7268,7 +7078,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7294,7 +7105,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7302,7 +7112,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxAmountIn: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7315,7 +7124,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7346,19 +7156,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     setRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SetRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7382,19 +7191,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     forceInsertRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'ForceInsertRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7420,28 +7228,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sellAll: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SellAll';
             params: { assetIn: number; assetOut: number; minAmountOut: bigint; route: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DynamicFees`'s transaction calls
@@ -7461,19 +7268,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDynamicFeesAssetFeeConfig} config
      **/
     setAssetFee: GenericTxCall<
-      Rv,
       (
         assetId: number,
         config: PalletDynamicFeesAssetFeeConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DynamicFees';
           palletCall: {
             name: 'SetAssetFee';
             params: { assetId: number; config: PalletDynamicFeesAssetFeeConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7490,23 +7296,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     removeAssetFee: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DynamicFees';
           palletCall: {
             name: 'RemoveAssetFee';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -7523,15 +7328,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     initializeStaking: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'InitializeStaking';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7554,16 +7358,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     stake: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Stake';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7589,19 +7392,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     increaseStake: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseStake';
             params: { positionId: bigint; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7624,16 +7426,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     claim: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Claim';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7654,23 +7455,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     unstake: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unstake';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Stableswap`'s transaction calls
@@ -7698,21 +7498,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} fee
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         shareAsset: number,
         assets: Array<number>,
         amplification: number,
         fee: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'CreatePool';
             params: { shareAsset: number; assets: Array<number>; amplification: number; fee: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7732,19 +7531,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} fee
      **/
     updatePoolFee: GenericTxCall<
-      Rv,
       (
         poolId: number,
         fee: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdatePoolFee';
             params: { poolId: number; fee: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7766,21 +7564,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} endBlock
      **/
     updateAmplification: GenericTxCall<
-      Rv,
       (
         poolId: number,
         finalAmplification: number,
         startBlock: number,
         endBlock: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdateAmplification';
             params: { poolId: number; finalAmplification: number; startBlock: number; endBlock: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7810,19 +7607,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsStableswapAssetAmount>} assets
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assets: Array<HydradxTraitsStableswapAssetAmount>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'AddLiquidity';
             params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7849,21 +7645,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAssetAmount
      **/
     addLiquidityShares: GenericTxCall<
-      Rv,
       (
         poolId: number,
         shares: bigint,
         assetId: number,
         maxAssetAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'AddLiquidityShares';
             params: { poolId: number; shares: bigint; assetId: number; maxAssetAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7892,21 +7687,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minAmountOut
      **/
     removeLiquidityOneAsset: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         shareAmount: bigint,
         minAmountOut: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'RemoveLiquidityOneAsset';
             params: { poolId: number; assetId: number; shareAmount: bigint; minAmountOut: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7931,21 +7725,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxShareAmount
      **/
     withdrawAssetAmount: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         amount: bigint,
         maxShareAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'WithdrawAssetAmount';
             params: { poolId: number; assetId: number; amount: bigint; maxShareAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7971,7 +7764,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBuyAmount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetIn: number,
@@ -7979,14 +7771,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountIn: bigint,
         minBuyAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'Sell';
             params: { poolId: number; assetIn: number; assetOut: number; amountIn: bigint; minBuyAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8012,7 +7804,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxSellAmount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetOut: number,
@@ -8020,14 +7811,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountOut: bigint,
         maxSellAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'Buy';
             params: { poolId: number; assetOut: number; assetIn: number; amountOut: bigint; maxSellAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8054,20 +7845,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStableswapTradability} state
      **/
     setAssetTradableState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         state: PalletStableswapTradability,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'SetAssetTradableState';
             params: { poolId: number; assetId: number; state: PalletStableswapTradability };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8105,20 +7895,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsStableswapAssetAmount>} minAmountsOut
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         poolId: number,
         shareAmount: bigint,
         minAmountsOut: Array<HydradxTraitsStableswapAssetAmount>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { poolId: number; shareAmount: bigint; minAmountsOut: Array<HydradxTraitsStableswapAssetAmount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8161,7 +7950,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxPegUpdate
      **/
     createPoolWithPegs: GenericTxCall<
-      Rv,
       (
         shareAsset: number,
         assets: Array<number>,
@@ -8170,7 +7958,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         pegSource: Array<PalletStableswapPegSource>,
         maxPegUpdate: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
@@ -8184,7 +7971,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxPegUpdate: Perbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8213,20 +8001,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minShares
      **/
     addAssetsLiquidity: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assets: Array<HydradxTraitsStableswapAssetAmount>,
         minShares: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'AddAssetsLiquidity';
             params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount>; minShares: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8256,20 +8043,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStableswapPegSource} pegSource
      **/
     updateAssetPegSource: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         pegSource: PalletStableswapPegSource,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdateAssetPegSource';
             params: { poolId: number; assetId: number; pegSource: PalletStableswapPegSource };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8295,26 +8081,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxPegUpdate
      **/
     updatePoolMaxPegUpdate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxPegUpdate: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdatePoolMaxPegUpdate';
             params: { poolId: number; maxPegUpdate: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bonds`'s transaction calls
@@ -8348,20 +8133,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maturity
      **/
     issue: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         maturity: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bonds';
           palletCall: {
             name: 'Issue';
             params: { assetId: number; amount: bigint; maturity: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8383,26 +8167,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     redeem: GenericTxCall<
-      Rv,
       (
         bondId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bonds';
           palletCall: {
             name: 'Redeem';
             params: { bondId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OtcSettlements`'s transaction calls
@@ -8435,27 +8218,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     settleOtcOrder: GenericTxCall<
-      Rv,
       (
         otcId: number,
         amount: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OtcSettlements';
           palletCall: {
             name: 'SettleOtcOrder';
             params: { otcId: number; amount: bigint; route: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `LBP`'s transaction calls
@@ -8509,7 +8291,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} repayTarget
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         poolOwner: AccountId32Like,
         assetA: number,
@@ -8523,7 +8304,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like,
         repayTarget: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -8542,7 +8322,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8577,7 +8358,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} repayTarget
      **/
     updatePoolData: GenericTxCall<
-      Rv,
       (
         poolId: AccountId32Like,
         poolOwner: AccountId32Like | undefined,
@@ -8589,7 +8369,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like | undefined,
         repayTarget: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -8606,7 +8385,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8628,19 +8408,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, bigint]} amountB
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         amountA: [number, bigint],
         amountB: [number, bigint],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'AddLiquidity';
             params: { amountA: [number, bigint]; amountB: [number, bigint] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8660,16 +8439,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} poolId
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (poolId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { poolId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8696,21 +8474,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8737,28 +8514,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYK`'s transaction calls
@@ -8781,21 +8557,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountB
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         assetA: number,
         amountA: bigint,
         assetB: number,
         amountB: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'CreatePool';
             params: { assetA: number; amountA: bigint; assetB: number; amountB: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8812,21 +8587,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountBMaxLimit
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         amountA: bigint,
         amountBMaxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'AddLiquidity';
             params: { assetA: number; assetB: number; amountA: bigint; amountBMaxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8839,7 +8613,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minShares
      **/
     addLiquidityWithLimits: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -8847,14 +8620,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountBMaxLimit: bigint,
         minShares: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'AddLiquidityWithLimits';
             params: { assetA: number; assetB: number; amountA: bigint; amountBMaxLimit: bigint; minShares: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8871,20 +8644,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} shareAmount
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         shareAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { assetA: number; assetB: number; shareAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8897,7 +8669,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minAmountB
      **/
     removeLiquidityWithLimits: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -8905,14 +8676,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minAmountA: bigint,
         minAmountB: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'RemoveLiquidityWithLimits';
             params: { assetA: number; assetB: number; shareAmount: bigint; minAmountA: bigint; minAmountB: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8933,7 +8704,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -8941,14 +8711,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8968,7 +8738,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
@@ -8976,21 +8745,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referrals`'s transaction calls
@@ -9014,16 +8783,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     registerCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'RegisterCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9042,16 +8810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     linkCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'LinkCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9066,16 +8833,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     convert: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'Convert';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9092,15 +8858,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimRewards: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'ClaimRewards';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9119,27 +8884,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletReferralsFeeDistribution} rewards
      **/
     setRewardPercentage: GenericTxCall<
-      Rv,
       (
         assetId: number,
         level: PalletReferralsLevel,
         rewards: PalletReferralsFeeDistribution,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'SetRewardPercentage';
             params: { assetId: number; level: PalletReferralsLevel; rewards: PalletReferralsFeeDistribution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Liquidation`'s transaction calls
@@ -9170,7 +8934,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     liquidate: GenericTxCall<
-      Rv,
       (
         collateralAsset: number,
         debtAsset: number,
@@ -9178,7 +8941,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         debtToCover: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Liquidation';
           palletCall: {
@@ -9191,7 +8953,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9201,23 +8964,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} contract
      **/
     setBorrowingContract: GenericTxCall<
-      Rv,
       (contract: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Liquidation';
           palletCall: {
             name: 'SetBorrowingContract';
             params: { contract: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `HSM`'s transaction calls
@@ -9258,7 +9020,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maxInHolding
      **/
     addCollateralAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         poolId: number,
@@ -9268,7 +9029,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         buybackRate: Perbill,
         maxInHolding: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
@@ -9283,7 +9043,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxInHolding: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9307,16 +9068,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     removeCollateralAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'RemoveCollateralAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9349,7 +9109,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined | undefined} maxInHolding
      **/
     updateCollateralAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         purchaseFee: Permill | undefined,
@@ -9358,7 +9117,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         buybackRate: Perbill | undefined,
         maxInHolding: bigint | undefined | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
@@ -9372,7 +9130,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxInHolding: bigint | undefined | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9411,21 +9170,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} slippageLimit
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amountIn: bigint,
         slippageLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amountIn: bigint; slippageLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9462,92 +9220,114 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} slippageLimit
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amountOut: bigint,
         slippageLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'Buy';
             params: { assetIn: number; assetOut: number; amountOut: bigint; slippageLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
-     * Execute arbitrage opportunity between HSM and collateral stable pool
+     * Execute arbitrage opportunity between HSM and collateral stable pool using flash loans
+     *
+     * This call is designed to be triggered automatically by offchain workers. It executes
+     * arbitrage by taking a flash loan from the GHO contract and performing trades to profit
+     * from price imbalances between HSM and the StableSwap pool.
      *
-     * This call is designed to be triggered automatically by offchain workers. It:
-     * 1. Detects price imbalances between HSM and a stable pool for a collateral
-     * 2. If an opportunity exists, mints Hollar, swaps it for collateral on HSM
-     * 3. Swaps that collateral for Hollar on the stable pool
-     * 4. Burns the Hollar received from the arbitrage
+     * The arbitrage execution flow:
+     * 1. Takes a flash loan of Hollar from the GHO contract
+     * 2. Executes trades between HSM and StableSwap pool based on arbitrage direction:
+     * - For HollarIn (buy direction): Sell Hollar to HSM for collateral, then sell collateral back for Hollar in pool
+     * - For HollarOut (sell direction): Sell Hollar for collateral in pool, then buy Hollar back from HSM
+     * 3. Repays the flash loan
+     * 4. Any remaining profit (in collateral) is transferred to the ArbitrageProfitReceiver
      *
      * This helps maintain the peg of Hollar by profiting from and correcting price imbalances.
      * The call is unsigned and should only be executed by offchain workers.
      *
      * Parameters:
      * - `origin`: Must be None (unsigned)
-     * - `collateral_asset_id`: The ID of the collateral asset to check for arbitrage
+     * - `collateral_asset_id`: The ID of the collateral asset to use for arbitrage
+     * - `arbitrage`: Optional arbitrage parameters (direction and amount). If None, the function
+     * will automatically find and calculate the optimal arbitrage opportunity.
      *
      * Emits:
      * - `ArbitrageExecuted` when the arbitrage is successful
      *
      * Errors:
+     * - `FlashMinterNotSet` if the flash minter contract address has not been configured
      * - `AssetNotApproved` if the asset is not a registered collateral
      * - `NoArbitrageOpportunity` if there's no profitable arbitrage opportunity
      * - `MaxBuyPriceExceeded` if the arbitrage would exceed the maximum buy price
+     * - `MaxBuyBackExceeded` if the arbitrage would exceed the buyback limit
      * - `InvalidEVMInteraction` if there's an error interacting with the Hollar ERC20 contract
      * - Other errors from underlying calls
      *
      * @param {number} collateralAssetId
-     * @param {bigint | undefined} flashAmount
+     * @param {PalletHsmArbitrage | undefined} arbitrage
      **/
     executeArbitrage: GenericTxCall<
-      Rv,
       (
         collateralAssetId: number,
-        flashAmount: bigint | undefined,
+        arbitrage: PalletHsmArbitrage | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'ExecuteArbitrage';
-            params: { collateralAssetId: number; flashAmount: bigint | undefined };
+            params: { collateralAssetId: number; arbitrage: PalletHsmArbitrage | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
+     * Set the flash minter contract address
+     *
+     * Configures the EVM address of the flash loan contract that will be used for arbitrage
+     * operations. This contract must support the ERC-3156 flash loan standard and be trusted
+     * to handle flash loans of Hollar tokens.
+     *
+     * Parameters:
+     * - `origin`: Must be authorized (governance/root)
+     * - `flash_minter_addr`: The EVM address of the flash minter contract
+     *
+     * Emits:
+     * - `FlashMinterSet` when the address is successfully configured
+     *
+     * Errors:
+     * - Authorization errors if origin is not authorized
      *
      * @param {H160} flashMinterAddr
      **/
     setFlashMinter: GenericTxCall<
-      Rv,
       (flashMinterAddr: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'SetFlashMinter';
             params: { flashMinterAddr: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Tokens`'s transaction calls
@@ -9573,20 +9353,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9616,20 +9395,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; currencyId: number; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9651,20 +9429,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9685,21 +9462,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9719,28 +9495,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newReserved
      **/
     setBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         newFree: bigint,
         newReserved: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'SetBalance';
             params: { who: AccountId32Like; currencyId: number; newFree: bigint; newReserved: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Currencies`'s transaction calls
@@ -9757,20 +9532,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9784,19 +9558,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferNativeCurrency: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'TransferNativeCurrency';
             params: { dest: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9810,27 +9583,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     updateBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'UpdateBalance';
             params: { who: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -9840,15 +9612,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claim: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Claim';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9858,19 +9629,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {OrmlVestingVestingSchedule} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         schedule: OrmlVestingVestingSchedule,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { dest: AccountId32Like; schedule: OrmlVestingVestingSchedule };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9880,19 +9650,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<OrmlVestingVestingSchedule>} vestingSchedules
      **/
     updateVestingSchedules: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         vestingSchedules: Array<OrmlVestingVestingSchedule>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'UpdateVestingSchedules';
             params: { who: AccountId32Like; vestingSchedules: Array<OrmlVestingVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9901,23 +9670,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     claimFor: GenericTxCall<
-      Rv,
       (dest: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ClaimFor';
             params: { dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVM`'s transaction calls
@@ -9930,19 +9698,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         address: H160,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
             name: 'Withdraw';
             params: { address: H160; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9960,7 +9727,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     call: GenericTxCall<
-      Rv,
       (
         source: H160,
         target: H160,
@@ -9972,7 +9738,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -9989,7 +9754,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10007,7 +9773,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -10018,7 +9783,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -10034,7 +9798,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10052,7 +9817,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create2: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -10064,7 +9828,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -10081,14 +9844,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Ethereum`'s transaction calls
@@ -10100,23 +9864,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     transact: GenericTxCall<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ethereum';
           palletCall: {
             name: 'Transact';
             params: { transaction: EthereumTransactionTransactionV2 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVMAccounts`'s transaction calls
@@ -10137,15 +9900,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bindEvmAddress: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'BindEvmAddress';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10161,16 +9923,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     addContractDeployer: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'AddContractDeployer';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10186,16 +9947,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     removeContractDeployer: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'RemoveContractDeployer';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10210,15 +9970,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     renounceContractDeployer: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'RenounceContractDeployer';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10236,16 +9995,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     approveContract: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'ApproveContract';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10261,23 +10019,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     disapproveContract: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'DisapproveContract';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKLiquidityMining`'s transaction calls
@@ -10325,7 +10082,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     createGlobalFarm: GenericTxCall<
-      Rv,
       (
         totalRewards: bigint,
         plannedYieldingPeriods: number,
@@ -10337,7 +10093,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minDeposit: bigint,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10354,7 +10109,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               priceAdjustment: FixedU128;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10374,19 +10130,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     updateGlobalFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateGlobalFarm';
             params: { globalFarmId: number; priceAdjustment: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10406,16 +10161,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} globalFarmId
      **/
     terminateGlobalFarm: GenericTxCall<
-      Rv,
       (globalFarmId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateGlobalFarm';
             params: { globalFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10445,14 +10199,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletLiquidityMiningLoyaltyCurve | undefined} loyaltyCurve
      **/
     createYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
         loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10464,7 +10216,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10486,20 +10239,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     updateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10524,19 +10276,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     stopYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'StopYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10565,21 +10316,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     resumeYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ResumeYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10609,20 +10359,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     terminateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10648,21 +10397,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} sharesAmount
      **/
     depositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         sharesAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'DepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; sharesAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10686,20 +10434,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} sharesAmount
      **/
     joinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         assetPair: PalletXykAssetPair,
         sharesAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'JoinFarms';
             params: { farmEntries: Array<[number, number]>; assetPair: PalletXykAssetPair; sharesAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10727,7 +10474,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, number]>} farmEntries
      **/
     addLiquidityAndJoinFarms: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -10735,7 +10481,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountBMaxLimit: bigint,
         farmEntries: Array<[number, number]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10748,7 +10493,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               farmEntries: Array<[number, number]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10775,21 +10521,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} depositId
      **/
     redepositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         depositId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'RedepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; depositId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10810,19 +10555,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     claimRewards: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ClaimRewards';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10855,20 +10599,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     withdrawShares: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'WithdrawShares';
             params: { depositId: bigint; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10895,27 +10638,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} farmEntries
      **/
     exitFarms: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         assetPair: PalletXykAssetPair,
         farmEntries: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ExitFarms';
             params: { depositId: bigint; assetPair: PalletXykAssetPair; farmEntries: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKWarehouseLM`'s transaction calls
@@ -10924,7 +10666,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RelayChainInfo`'s transaction calls
@@ -10933,7 +10675,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DCA`'s transaction calls
@@ -10970,19 +10712,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startExecutionBlock
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         schedule: PalletDcaSchedule,
         startExecutionBlock: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'Schedule';
             params: { schedule: PalletDcaSchedule; startExecutionBlock: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11003,19 +10744,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} nextExecutionBlock
      **/
     terminate: GenericTxCall<
-      Rv,
       (
         scheduleId: number,
         nextExecutionBlock: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'Terminate';
             params: { scheduleId: number; nextExecutionBlock: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11038,26 +10778,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     unlockReserves: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'UnlockReserves';
             params: { who: AccountId32Like; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -11072,14 +10811,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11091,7 +10828,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11102,19 +10840,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11128,7 +10865,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -11136,7 +10872,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11149,7 +10884,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11159,16 +10895,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11181,14 +10916,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11200,7 +10933,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11214,7 +10948,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -11222,7 +10955,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11235,7 +10967,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11258,20 +10991,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11294,20 +11026,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11317,16 +11048,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11336,23 +11066,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -11372,16 +11101,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPrimitivesParachainInherentParachainInherentData} data
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (data: CumulusPrimitivesParachainInherentParachainInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SetValidationData';
             params: { data: CumulusPrimitivesParachainInherentParachainInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11390,23 +11118,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -11415,7 +11142,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -11427,19 +11154,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11469,14 +11195,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11488,7 +11212,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11530,14 +11255,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11549,7 +11272,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11567,19 +11291,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11595,19 +11318,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV4Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV4Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11621,16 +11343,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11643,16 +11364,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11667,16 +11387,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11719,7 +11438,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11727,7 +11445,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11740,7 +11457,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11771,7 +11489,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11779,7 +11496,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11792,7 +11508,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11805,16 +11522,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11860,7 +11576,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11868,7 +11583,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11881,7 +11595,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11897,19 +11612,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11972,7 +11686,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -11982,7 +11695,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11997,14 +11709,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -12013,7 +11726,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -12026,19 +11739,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12063,14 +11775,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -12082,14 +11792,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OrmlXcm`'s transaction calls
@@ -12102,26 +11813,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendAsSovereign: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OrmlXcm';
           palletCall: {
             name: 'SendAsSovereign';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XTokens`'s transaction calls
@@ -12147,14 +11857,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12166,7 +11874,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12189,20 +11898,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiasset: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
             name: 'TransferMultiasset';
             params: { asset: XcmVersionedAsset; dest: XcmVersionedLocation; destWeightLimit: XcmV3WeightLimit };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12236,7 +11944,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferWithFee: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
@@ -12244,7 +11951,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12257,7 +11963,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12290,14 +11997,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassetWithFee: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         fee: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12309,7 +12014,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12336,14 +12042,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMulticurrencies: GenericTxCall<
-      Rv,
       (
         currencies: Array<[number, bigint]>,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12355,7 +12059,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12382,14 +12087,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12401,14 +12104,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -12432,16 +12136,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12455,16 +12158,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12480,16 +12182,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12501,15 +12202,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12522,15 +12222,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12543,16 +12242,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12565,16 +12263,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12590,16 +12287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12616,26 +12312,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -12656,19 +12351,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: HydradxRuntimeOpaqueSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: HydradxRuntimeOpaqueSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12688,22 +12382,294 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Generic pallet tx call
+     **/
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
+  };
+  /**
+   * Pallet `Ismp`'s transaction calls
+   **/
+  ismp: {
+    /**
+     * Execute the provided batch of ISMP messages, this will short-circuit and revert if any
+     * of the provided messages are invalid. This is an unsigned extrinsic that permits anyone
+     * execute ISMP messages for free, provided they have valid proofs and the messages have
+     * not been previously processed.
+     *
+     * The dispatch origin for this call must be an unsigned one.
+     *
+     * - `messages`: the messages to handle or process.
+     *
+     * Emits different message events based on the Message received if successful.
+     *
+     * @param {Array<IsmpMessagingMessage>} messages
+     **/
+    handleUnsigned: GenericTxCall<
+      (messages: Array<IsmpMessagingMessage>) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'Ismp';
+          palletCall: {
+            name: 'HandleUnsigned';
+            params: { messages: Array<IsmpMessagingMessage> };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Create a consensus client, using a subjectively chosen consensus state. This can also
+     * be used to overwrite an existing consensus state. The dispatch origin for this
+     * call must be `T::AdminOrigin`.
+     *
+     * - `message`: [`CreateConsensusState`] struct.
+     *
+     * Emits [`Event::ConsensusClientCreated`] if successful.
+     *
+     * @param {IsmpMessagingCreateConsensusState} message
+     **/
+    createConsensusClient: GenericTxCall<
+      (message: IsmpMessagingCreateConsensusState) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'Ismp';
+          palletCall: {
+            name: 'CreateConsensusClient';
+            params: { message: IsmpMessagingCreateConsensusState };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Modify the unbonding period and challenge period for a consensus state.
+     * The dispatch origin for this call must be `T::AdminOrigin`.
+     *
+     * - `message`: `UpdateConsensusState` struct.
+     *
+     * @param {PalletIsmpUtilsUpdateConsensusState} message
+     **/
+    updateConsensusState: GenericTxCall<
+      (message: PalletIsmpUtilsUpdateConsensusState) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'Ismp';
+          palletCall: {
+            name: 'UpdateConsensusState';
+            params: { message: PalletIsmpUtilsUpdateConsensusState };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Add more funds to a message (request or response) to be used for delivery and execution.
+     *
+     * Should not be called on a message that has been completed (delivered or timed-out) as
+     * those funds will be lost forever.
+     *
+     * @param {PalletIsmpUtilsFundMessageParams} message
+     **/
+    fundMessage: GenericTxCall<
+      (message: PalletIsmpUtilsFundMessageParams) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'Ismp';
+          palletCall: {
+            name: 'FundMessage';
+            params: { message: PalletIsmpUtilsFundMessageParams };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Generic pallet tx call
+     **/
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
+  };
+  /**
+   * Pallet `IsmpParachain`'s transaction calls
+   **/
+  ismpParachain: {
+    /**
+     * This allows block builders submit parachain consensus proofs as inherents. If the
+     * provided [`ConsensusMessage`] is not for a parachain, this call will fail.
+     *
+     * @param {IsmpMessagingConsensusMessage} data
+     **/
+    updateParachainConsensus: GenericTxCall<
+      (data: IsmpMessagingConsensusMessage) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'IsmpParachain';
+          palletCall: {
+            name: 'UpdateParachainConsensus';
+            params: { data: IsmpMessagingConsensusMessage };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Add some new parachains to the parachains whitelist
+     *
+     * @param {Array<IsmpParachainParachainData>} paraIds
+     **/
+    addParachain: GenericTxCall<
+      (paraIds: Array<IsmpParachainParachainData>) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'IsmpParachain';
+          palletCall: {
+            name: 'AddParachain';
+            params: { paraIds: Array<IsmpParachainParachainData> };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Removes some parachains from the parachains whitelist
+     *
+     * @param {Array<number>} paraIds
+     **/
+    removeParachain: GenericTxCall<
+      (paraIds: Array<number>) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'IsmpParachain';
+          palletCall: {
+            name: 'RemoveParachain';
+            params: { paraIds: Array<number> };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Generic pallet tx call
+     **/
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
+  };
+  /**
+   * Pallet `TokenGateway`'s transaction calls
+   **/
+  tokenGateway: {
+    /**
+     * Teleports a registered asset
+     * locks the asset and dispatches a request to token gateway on the destination
+     *
+     * @param {PalletTokenGatewayTeleportParams} params
+     **/
+    teleport: GenericTxCall<
+      (params: PalletTokenGatewayTeleportParams) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'TokenGateway';
+          palletCall: {
+            name: 'Teleport';
+            params: { params: PalletTokenGatewayTeleportParams };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Set the token gateway address for specified chains
+     *
+     * @param {Array<[IsmpHostStateMachine, BytesLike]>} addresses
+     **/
+    setTokenGatewayAddresses: GenericTxCall<
+      (addresses: Array<[IsmpHostStateMachine, BytesLike]>) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'TokenGateway';
+          palletCall: {
+            name: 'SetTokenGatewayAddresses';
+            params: { addresses: Array<[IsmpHostStateMachine, BytesLike]> };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+     *
+     * This works by dispatching a request to the TokenGateway module on each requested chain
+     * to create the asset.
+     * `native` should be true if this asset originates from this chain
+     *
+     * @param {PalletTokenGatewayAssetRegistration} asset
+     **/
+    createErc6160Asset: GenericTxCall<
+      (asset: PalletTokenGatewayAssetRegistration) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'TokenGateway';
+          palletCall: {
+            name: 'CreateErc6160Asset';
+            params: { asset: PalletTokenGatewayAssetRegistration };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+     *
+     * This works by dispatching a request to the TokenGateway module on each requested chain
+     * to create the asset.
+     *
+     * @param {TokenGatewayPrimitivesGatewayAssetUpdate} asset
+     **/
+    updateErc6160Asset: GenericTxCall<
+      (asset: TokenGatewayPrimitivesGatewayAssetUpdate) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'TokenGateway';
+          palletCall: {
+            name: 'UpdateErc6160Asset';
+            params: { asset: TokenGatewayPrimitivesGatewayAssetUpdate };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Update the precision for an existing asset
+     *
+     * @param {PalletTokenGatewayPrecisionUpdate} update
+     **/
+    updateAssetPrecision: GenericTxCall<
+      (update: PalletTokenGatewayPrecisionUpdate) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'TokenGateway';
+          palletCall: {
+            name: 'UpdateAssetPrecision';
+            params: { update: PalletTokenGatewayPrecisionUpdate };
+          };
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EmaOracle`'s transaction calls
@@ -12715,19 +12681,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     addOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'AddOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12737,19 +12702,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     removeOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'RemoveOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12760,27 +12724,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[bigint, bigint]} price
      **/
     updateBifrostOracle: GenericTxCall<
-      Rv,
       (
         assetA: XcmVersionedLocation,
         assetB: XcmVersionedLocation,
         price: [bigint, bigint],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'UpdateBifrostOracle';
             params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Broadcast`'s transaction calls
@@ -12789,6 +12752,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/hydration/types.d.ts b/packages/chaintypes/src/hydration/types.d.ts
index 1dba7c7e..fec770d0 100644
--- a/packages/chaintypes/src/hydration/types.d.ts
+++ b/packages/chaintypes/src/hydration/types.d.ts
@@ -113,6 +113,10 @@ export type HydradxRuntimeRuntimeEvent =
   | { pallet: 'UnknownTokens'; palletEvent: OrmlUnknownTokensModuleEvent }
   | { pallet: 'CollatorSelection'; palletEvent: PalletCollatorSelectionEvent }
   | { pallet: 'Session'; palletEvent: PalletSessionEvent }
+  | { pallet: 'Ismp'; palletEvent: PalletIsmpEvent }
+  | { pallet: 'IsmpParachain'; palletEvent: IsmpParachainEvent }
+  | { pallet: 'Hyperbridge'; palletEvent: PalletHyperbridgeEvent }
+  | { pallet: 'TokenGateway'; palletEvent: PalletTokenGatewayEvent }
   | { pallet: 'EmaOracle'; palletEvent: PalletEmaOracleEvent }
   | { pallet: 'Broadcast'; palletEvent: PalletBroadcastEvent };
 
@@ -1308,6 +1312,9 @@ export type HydradxRuntimeRuntimeCall =
   | { pallet: 'XTokens'; palletCall: OrmlXtokensModuleCall }
   | { pallet: 'CollatorSelection'; palletCall: PalletCollatorSelectionCall }
   | { pallet: 'Session'; palletCall: PalletSessionCall }
+  | { pallet: 'Ismp'; palletCall: PalletIsmpCall }
+  | { pallet: 'IsmpParachain'; palletCall: IsmpParachainCall }
+  | { pallet: 'TokenGateway'; palletCall: PalletTokenGatewayCall }
   | { pallet: 'EmaOracle'; palletCall: PalletEmaOracleCall }
   | { pallet: 'Broadcast'; palletCall: PalletBroadcastCall };
 
@@ -1371,6 +1378,9 @@ export type HydradxRuntimeRuntimeCallLike =
   | { pallet: 'XTokens'; palletCall: OrmlXtokensModuleCallLike }
   | { pallet: 'CollatorSelection'; palletCall: PalletCollatorSelectionCallLike }
   | { pallet: 'Session'; palletCall: PalletSessionCallLike }
+  | { pallet: 'Ismp'; palletCall: PalletIsmpCallLike }
+  | { pallet: 'IsmpParachain'; palletCall: IsmpParachainCallLike }
+  | { pallet: 'TokenGateway'; palletCall: PalletTokenGatewayCallLike }
   | { pallet: 'EmaOracle'; palletCall: PalletEmaOracleCallLike }
   | { pallet: 'Broadcast'; palletCall: PalletBroadcastCallLike };
 
@@ -6823,41 +6833,65 @@ export type PalletDusterCall =
   /**
    * Dust specified account.
    * IF account balance is < min. existential deposit of given currency, and account is allowed to
-   * be dusted, the remaining balance is transferred to selected account (usually treasury).
+   * be dusted, the remaining balance is transferred to treasury account.
    *
-   * Caller is rewarded with chosen reward in native currency.
+   * In case of AToken, we perform an erc20 dust, which does a wihtdraw all then supply atoken on behalf of the dust receiver
+   *
+   * The transaction fee is returned back in case of successful dusting.
+   *
+   * Treasury account can never be dusted.
+   *
+   * Emits `Dusted` event when successful.
    **/
   | { name: 'DustAccount'; params: { account: AccountId32; currencyId: number } }
   /**
-   * Add account to list of non-dustable account. Account whihc are excluded from udsting.
-   * If such account should be dusted - `AccountBlacklisted` error is returned.
+   * Add account to list of whitelist accounts. Account which are excluded from dusting.
+   * If such account should be dusted - `AccountWhitelisted` error is returned.
    * Only root can perform this action.
+   *
+   * Emits `Added` event when successful.
+   *
    **/
-  | { name: 'AddNondustableAccount'; params: { account: AccountId32 } }
+  | { name: 'WhitelistAccount'; params: { account: AccountId32 } }
   /**
-   * Remove account from list of non-dustable accounts. That means account can be dusted again.
+   * Remove account from list of whitelist accounts. That means account can be dusted again.
+   *
+   * Emits `Removed` event when successful.
+   *
    **/
-  | { name: 'RemoveNondustableAccount'; params: { account: AccountId32 } };
+  | { name: 'RemoveFromWhitelist'; params: { account: AccountId32 } };
 
 export type PalletDusterCallLike =
   /**
    * Dust specified account.
    * IF account balance is < min. existential deposit of given currency, and account is allowed to
-   * be dusted, the remaining balance is transferred to selected account (usually treasury).
+   * be dusted, the remaining balance is transferred to treasury account.
    *
-   * Caller is rewarded with chosen reward in native currency.
+   * In case of AToken, we perform an erc20 dust, which does a wihtdraw all then supply atoken on behalf of the dust receiver
+   *
+   * The transaction fee is returned back in case of successful dusting.
+   *
+   * Treasury account can never be dusted.
+   *
+   * Emits `Dusted` event when successful.
    **/
   | { name: 'DustAccount'; params: { account: AccountId32Like; currencyId: number } }
   /**
-   * Add account to list of non-dustable account. Account whihc are excluded from udsting.
-   * If such account should be dusted - `AccountBlacklisted` error is returned.
+   * Add account to list of whitelist accounts. Account which are excluded from dusting.
+   * If such account should be dusted - `AccountWhitelisted` error is returned.
    * Only root can perform this action.
+   *
+   * Emits `Added` event when successful.
+   *
    **/
-  | { name: 'AddNondustableAccount'; params: { account: AccountId32Like } }
+  | { name: 'WhitelistAccount'; params: { account: AccountId32Like } }
   /**
-   * Remove account from list of non-dustable accounts. That means account can be dusted again.
+   * Remove account from list of whitelist accounts. That means account can be dusted again.
+   *
+   * Emits `Removed` event when successful.
+   *
    **/
-  | { name: 'RemoveNondustableAccount'; params: { account: AccountId32Like } };
+  | { name: 'RemoveFromWhitelist'; params: { account: AccountId32Like } };
 
 /**
  * Contains a variant per dispatchable extrinsic that this pallet has.
@@ -9935,32 +9969,59 @@ export type PalletHsmCall =
    **/
   | { name: 'Buy'; params: { assetIn: number; assetOut: number; amountOut: bigint; slippageLimit: bigint } }
   /**
-   * Execute arbitrage opportunity between HSM and collateral stable pool
+   * Execute arbitrage opportunity between HSM and collateral stable pool using flash loans
    *
-   * This call is designed to be triggered automatically by offchain workers. It:
-   * 1. Detects price imbalances between HSM and a stable pool for a collateral
-   * 2. If an opportunity exists, mints Hollar, swaps it for collateral on HSM
-   * 3. Swaps that collateral for Hollar on the stable pool
-   * 4. Burns the Hollar received from the arbitrage
+   * This call is designed to be triggered automatically by offchain workers. It executes
+   * arbitrage by taking a flash loan from the GHO contract and performing trades to profit
+   * from price imbalances between HSM and the StableSwap pool.
+   *
+   * The arbitrage execution flow:
+   * 1. Takes a flash loan of Hollar from the GHO contract
+   * 2. Executes trades between HSM and StableSwap pool based on arbitrage direction:
+   * - For HollarIn (buy direction): Sell Hollar to HSM for collateral, then sell collateral back for Hollar in pool
+   * - For HollarOut (sell direction): Sell Hollar for collateral in pool, then buy Hollar back from HSM
+   * 3. Repays the flash loan
+   * 4. Any remaining profit (in collateral) is transferred to the ArbitrageProfitReceiver
    *
    * This helps maintain the peg of Hollar by profiting from and correcting price imbalances.
    * The call is unsigned and should only be executed by offchain workers.
    *
    * Parameters:
    * - `origin`: Must be None (unsigned)
-   * - `collateral_asset_id`: The ID of the collateral asset to check for arbitrage
+   * - `collateral_asset_id`: The ID of the collateral asset to use for arbitrage
+   * - `arbitrage`: Optional arbitrage parameters (direction and amount). If None, the function
+   * will automatically find and calculate the optimal arbitrage opportunity.
    *
    * Emits:
    * - `ArbitrageExecuted` when the arbitrage is successful
    *
    * Errors:
+   * - `FlashMinterNotSet` if the flash minter contract address has not been configured
    * - `AssetNotApproved` if the asset is not a registered collateral
    * - `NoArbitrageOpportunity` if there's no profitable arbitrage opportunity
    * - `MaxBuyPriceExceeded` if the arbitrage would exceed the maximum buy price
+   * - `MaxBuyBackExceeded` if the arbitrage would exceed the buyback limit
    * - `InvalidEVMInteraction` if there's an error interacting with the Hollar ERC20 contract
    * - Other errors from underlying calls
    **/
-  | { name: 'ExecuteArbitrage'; params: { collateralAssetId: number; flashAmount?: bigint | undefined } }
+  | { name: 'ExecuteArbitrage'; params: { collateralAssetId: number; arbitrage?: PalletHsmArbitrage | undefined } }
+  /**
+   * Set the flash minter contract address
+   *
+   * Configures the EVM address of the flash loan contract that will be used for arbitrage
+   * operations. This contract must support the ERC-3156 flash loan standard and be trusted
+   * to handle flash loans of Hollar tokens.
+   *
+   * Parameters:
+   * - `origin`: Must be authorized (governance/root)
+   * - `flash_minter_addr`: The EVM address of the flash minter contract
+   *
+   * Emits:
+   * - `FlashMinterSet` when the address is successfully configured
+   *
+   * Errors:
+   * - Authorization errors if origin is not authorized
+   **/
   | { name: 'SetFlashMinter'; params: { flashMinterAddr: H160 } };
 
 export type PalletHsmCallLike =
@@ -10111,34 +10172,63 @@ export type PalletHsmCallLike =
    **/
   | { name: 'Buy'; params: { assetIn: number; assetOut: number; amountOut: bigint; slippageLimit: bigint } }
   /**
-   * Execute arbitrage opportunity between HSM and collateral stable pool
+   * Execute arbitrage opportunity between HSM and collateral stable pool using flash loans
+   *
+   * This call is designed to be triggered automatically by offchain workers. It executes
+   * arbitrage by taking a flash loan from the GHO contract and performing trades to profit
+   * from price imbalances between HSM and the StableSwap pool.
    *
-   * This call is designed to be triggered automatically by offchain workers. It:
-   * 1. Detects price imbalances between HSM and a stable pool for a collateral
-   * 2. If an opportunity exists, mints Hollar, swaps it for collateral on HSM
-   * 3. Swaps that collateral for Hollar on the stable pool
-   * 4. Burns the Hollar received from the arbitrage
+   * The arbitrage execution flow:
+   * 1. Takes a flash loan of Hollar from the GHO contract
+   * 2. Executes trades between HSM and StableSwap pool based on arbitrage direction:
+   * - For HollarIn (buy direction): Sell Hollar to HSM for collateral, then sell collateral back for Hollar in pool
+   * - For HollarOut (sell direction): Sell Hollar for collateral in pool, then buy Hollar back from HSM
+   * 3. Repays the flash loan
+   * 4. Any remaining profit (in collateral) is transferred to the ArbitrageProfitReceiver
    *
    * This helps maintain the peg of Hollar by profiting from and correcting price imbalances.
    * The call is unsigned and should only be executed by offchain workers.
    *
    * Parameters:
    * - `origin`: Must be None (unsigned)
-   * - `collateral_asset_id`: The ID of the collateral asset to check for arbitrage
+   * - `collateral_asset_id`: The ID of the collateral asset to use for arbitrage
+   * - `arbitrage`: Optional arbitrage parameters (direction and amount). If None, the function
+   * will automatically find and calculate the optimal arbitrage opportunity.
    *
    * Emits:
    * - `ArbitrageExecuted` when the arbitrage is successful
    *
    * Errors:
+   * - `FlashMinterNotSet` if the flash minter contract address has not been configured
    * - `AssetNotApproved` if the asset is not a registered collateral
    * - `NoArbitrageOpportunity` if there's no profitable arbitrage opportunity
    * - `MaxBuyPriceExceeded` if the arbitrage would exceed the maximum buy price
+   * - `MaxBuyBackExceeded` if the arbitrage would exceed the buyback limit
    * - `InvalidEVMInteraction` if there's an error interacting with the Hollar ERC20 contract
    * - Other errors from underlying calls
    **/
-  | { name: 'ExecuteArbitrage'; params: { collateralAssetId: number; flashAmount?: bigint | undefined } }
+  | { name: 'ExecuteArbitrage'; params: { collateralAssetId: number; arbitrage?: PalletHsmArbitrage | undefined } }
+  /**
+   * Set the flash minter contract address
+   *
+   * Configures the EVM address of the flash loan contract that will be used for arbitrage
+   * operations. This contract must support the ERC-3156 flash loan standard and be trusted
+   * to handle flash loans of Hollar tokens.
+   *
+   * Parameters:
+   * - `origin`: Must be authorized (governance/root)
+   * - `flash_minter_addr`: The EVM address of the flash minter contract
+   *
+   * Emits:
+   * - `FlashMinterSet` when the address is successfully configured
+   *
+   * Errors:
+   * - Authorization errors if origin is not authorized
+   **/
   | { name: 'SetFlashMinter'; params: { flashMinterAddr: H160 } };
 
+export type PalletHsmArbitrage = { type: 'HollarOut'; value: bigint } | { type: 'HollarIn'; value: bigint };
+
 /**
  * Contains a variant per dispatchable extrinsic that this pallet has.
  **/
@@ -13628,6 +13718,323 @@ export type HydradxRuntimeOpaqueSessionKeys = { aura: SpConsensusAuraSr25519AppS
 
 export type SpConsensusAuraSr25519AppSr25519Public = FixedBytes<32>;
 
+/**
+ * Contains a variant per dispatchable extrinsic that this pallet has.
+ **/
+export type PalletIsmpCall =
+  /**
+   * Execute the provided batch of ISMP messages, this will short-circuit and revert if any
+   * of the provided messages are invalid. This is an unsigned extrinsic that permits anyone
+   * execute ISMP messages for free, provided they have valid proofs and the messages have
+   * not been previously processed.
+   *
+   * The dispatch origin for this call must be an unsigned one.
+   *
+   * - `messages`: the messages to handle or process.
+   *
+   * Emits different message events based on the Message received if successful.
+   **/
+  | { name: 'HandleUnsigned'; params: { messages: Array<IsmpMessagingMessage> } }
+  /**
+   * Create a consensus client, using a subjectively chosen consensus state. This can also
+   * be used to overwrite an existing consensus state. The dispatch origin for this
+   * call must be `T::AdminOrigin`.
+   *
+   * - `message`: [`CreateConsensusState`] struct.
+   *
+   * Emits [`Event::ConsensusClientCreated`] if successful.
+   **/
+  | { name: 'CreateConsensusClient'; params: { message: IsmpMessagingCreateConsensusState } }
+  /**
+   * Modify the unbonding period and challenge period for a consensus state.
+   * The dispatch origin for this call must be `T::AdminOrigin`.
+   *
+   * - `message`: `UpdateConsensusState` struct.
+   **/
+  | { name: 'UpdateConsensusState'; params: { message: PalletIsmpUtilsUpdateConsensusState } }
+  /**
+   * Add more funds to a message (request or response) to be used for delivery and execution.
+   *
+   * Should not be called on a message that has been completed (delivered or timed-out) as
+   * those funds will be lost forever.
+   **/
+  | { name: 'FundMessage'; params: { message: PalletIsmpUtilsFundMessageParams } };
+
+export type PalletIsmpCallLike =
+  /**
+   * Execute the provided batch of ISMP messages, this will short-circuit and revert if any
+   * of the provided messages are invalid. This is an unsigned extrinsic that permits anyone
+   * execute ISMP messages for free, provided they have valid proofs and the messages have
+   * not been previously processed.
+   *
+   * The dispatch origin for this call must be an unsigned one.
+   *
+   * - `messages`: the messages to handle or process.
+   *
+   * Emits different message events based on the Message received if successful.
+   **/
+  | { name: 'HandleUnsigned'; params: { messages: Array<IsmpMessagingMessage> } }
+  /**
+   * Create a consensus client, using a subjectively chosen consensus state. This can also
+   * be used to overwrite an existing consensus state. The dispatch origin for this
+   * call must be `T::AdminOrigin`.
+   *
+   * - `message`: [`CreateConsensusState`] struct.
+   *
+   * Emits [`Event::ConsensusClientCreated`] if successful.
+   **/
+  | { name: 'CreateConsensusClient'; params: { message: IsmpMessagingCreateConsensusState } }
+  /**
+   * Modify the unbonding period and challenge period for a consensus state.
+   * The dispatch origin for this call must be `T::AdminOrigin`.
+   *
+   * - `message`: `UpdateConsensusState` struct.
+   **/
+  | { name: 'UpdateConsensusState'; params: { message: PalletIsmpUtilsUpdateConsensusState } }
+  /**
+   * Add more funds to a message (request or response) to be used for delivery and execution.
+   *
+   * Should not be called on a message that has been completed (delivered or timed-out) as
+   * those funds will be lost forever.
+   **/
+  | { name: 'FundMessage'; params: { message: PalletIsmpUtilsFundMessageParams } };
+
+export type IsmpMessagingMessage =
+  | { type: 'Consensus'; value: IsmpMessagingConsensusMessage }
+  | { type: 'FraudProof'; value: IsmpMessagingFraudProofMessage }
+  | { type: 'Request'; value: IsmpMessagingRequestMessage }
+  | { type: 'Response'; value: IsmpMessagingResponseMessage }
+  | { type: 'Timeout'; value: IsmpMessagingTimeoutMessage };
+
+export type IsmpMessagingConsensusMessage = { consensusProof: Bytes; consensusStateId: FixedBytes<4>; signer: Bytes };
+
+export type IsmpMessagingFraudProofMessage = { proof1: Bytes; proof2: Bytes; consensusStateId: FixedBytes<4> };
+
+export type IsmpMessagingRequestMessage = {
+  requests: Array<IsmpRouterPostRequest>;
+  proof: IsmpMessagingProof;
+  signer: Bytes;
+};
+
+export type IsmpRouterPostRequest = {
+  source: IsmpHostStateMachine;
+  dest: IsmpHostStateMachine;
+  nonce: bigint;
+  from: Bytes;
+  to: Bytes;
+  timeoutTimestamp: bigint;
+  body: Bytes;
+};
+
+export type IsmpHostStateMachine =
+  | { type: 'Evm'; value: number }
+  | { type: 'Polkadot'; value: number }
+  | { type: 'Kusama'; value: number }
+  | { type: 'Substrate'; value: FixedBytes<4> }
+  | { type: 'Tendermint'; value: FixedBytes<4> };
+
+export type IsmpMessagingProof = { height: IsmpConsensusStateMachineHeight; proof: Bytes };
+
+export type IsmpConsensusStateMachineHeight = { id: IsmpConsensusStateMachineId; height: bigint };
+
+export type IsmpConsensusStateMachineId = { stateId: IsmpHostStateMachine; consensusStateId: FixedBytes<4> };
+
+export type IsmpMessagingResponseMessage = {
+  datagram: IsmpRouterRequestResponse;
+  proof: IsmpMessagingProof;
+  signer: Bytes;
+};
+
+export type IsmpRouterRequestResponse =
+  | { type: 'Request'; value: Array<IsmpRouterRequest> }
+  | { type: 'Response'; value: Array<IsmpRouterResponse> };
+
+export type IsmpRouterRequest =
+  | { type: 'Post'; value: IsmpRouterPostRequest }
+  | { type: 'Get'; value: IsmpRouterGetRequest };
+
+export type IsmpRouterGetRequest = {
+  source: IsmpHostStateMachine;
+  dest: IsmpHostStateMachine;
+  nonce: bigint;
+  from: Bytes;
+  keys: Array<Bytes>;
+  height: bigint;
+  context: Bytes;
+  timeoutTimestamp: bigint;
+};
+
+export type IsmpRouterResponse =
+  | { type: 'Post'; value: IsmpRouterPostResponse }
+  | { type: 'Get'; value: IsmpRouterGetResponse };
+
+export type IsmpRouterPostResponse = { post: IsmpRouterPostRequest; response: Bytes; timeoutTimestamp: bigint };
+
+export type IsmpRouterGetResponse = { get: IsmpRouterGetRequest; values: Array<IsmpRouterStorageValue> };
+
+export type IsmpRouterStorageValue = { key: Bytes; value?: Bytes | undefined };
+
+export type IsmpMessagingTimeoutMessage =
+  | { type: 'Post'; value: { requests: Array<IsmpRouterRequest>; timeoutProof: IsmpMessagingProof } }
+  | { type: 'PostResponse'; value: { responses: Array<IsmpRouterPostResponse>; timeoutProof: IsmpMessagingProof } }
+  | { type: 'Get'; value: { requests: Array<IsmpRouterRequest> } };
+
+export type IsmpMessagingCreateConsensusState = {
+  consensusState: Bytes;
+  consensusClientId: FixedBytes<4>;
+  consensusStateId: FixedBytes<4>;
+  unbondingPeriod: bigint;
+  challengePeriods: Array<[IsmpHostStateMachine, bigint]>;
+  stateMachineCommitments: Array<[IsmpConsensusStateMachineId, IsmpMessagingStateCommitmentHeight]>;
+};
+
+export type IsmpMessagingStateCommitmentHeight = { commitment: IsmpConsensusStateCommitment; height: bigint };
+
+export type IsmpConsensusStateCommitment = { timestamp: bigint; overlayRoot?: H256 | undefined; stateRoot: H256 };
+
+export type PalletIsmpUtilsUpdateConsensusState = {
+  consensusStateId: FixedBytes<4>;
+  unbondingPeriod?: bigint | undefined;
+  challengePeriods: Array<[IsmpHostStateMachine, bigint]>;
+};
+
+export type PalletIsmpUtilsFundMessageParams = { commitment: PalletIsmpUtilsMessageCommitment; amount: bigint };
+
+export type PalletIsmpUtilsMessageCommitment = { type: 'Request'; value: H256 } | { type: 'Response'; value: H256 };
+
+/**
+ * Contains a variant per dispatchable extrinsic that this pallet has.
+ **/
+export type IsmpParachainCall =
+  /**
+   * This allows block builders submit parachain consensus proofs as inherents. If the
+   * provided [`ConsensusMessage`] is not for a parachain, this call will fail.
+   **/
+  | { name: 'UpdateParachainConsensus'; params: { data: IsmpMessagingConsensusMessage } }
+  /**
+   * Add some new parachains to the parachains whitelist
+   **/
+  | { name: 'AddParachain'; params: { paraIds: Array<IsmpParachainParachainData> } }
+  /**
+   * Removes some parachains from the parachains whitelist
+   **/
+  | { name: 'RemoveParachain'; params: { paraIds: Array<number> } };
+
+export type IsmpParachainCallLike =
+  /**
+   * This allows block builders submit parachain consensus proofs as inherents. If the
+   * provided [`ConsensusMessage`] is not for a parachain, this call will fail.
+   **/
+  | { name: 'UpdateParachainConsensus'; params: { data: IsmpMessagingConsensusMessage } }
+  /**
+   * Add some new parachains to the parachains whitelist
+   **/
+  | { name: 'AddParachain'; params: { paraIds: Array<IsmpParachainParachainData> } }
+  /**
+   * Removes some parachains from the parachains whitelist
+   **/
+  | { name: 'RemoveParachain'; params: { paraIds: Array<number> } };
+
+export type IsmpParachainParachainData = { id: number; slotDuration: bigint };
+
+/**
+ * Contains a variant per dispatchable extrinsic that this pallet has.
+ **/
+export type PalletTokenGatewayCall =
+  /**
+   * Teleports a registered asset
+   * locks the asset and dispatches a request to token gateway on the destination
+   **/
+  | { name: 'Teleport'; params: { params: PalletTokenGatewayTeleportParams } }
+  /**
+   * Set the token gateway address for specified chains
+   **/
+  | { name: 'SetTokenGatewayAddresses'; params: { addresses: Array<[IsmpHostStateMachine, Bytes]> } }
+  /**
+   * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+   *
+   * This works by dispatching a request to the TokenGateway module on each requested chain
+   * to create the asset.
+   * `native` should be true if this asset originates from this chain
+   **/
+  | { name: 'CreateErc6160Asset'; params: { asset: PalletTokenGatewayAssetRegistration } }
+  /**
+   * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+   *
+   * This works by dispatching a request to the TokenGateway module on each requested chain
+   * to create the asset.
+   **/
+  | { name: 'UpdateErc6160Asset'; params: { asset: TokenGatewayPrimitivesGatewayAssetUpdate } }
+  /**
+   * Update the precision for an existing asset
+   **/
+  | { name: 'UpdateAssetPrecision'; params: { update: PalletTokenGatewayPrecisionUpdate } };
+
+export type PalletTokenGatewayCallLike =
+  /**
+   * Teleports a registered asset
+   * locks the asset and dispatches a request to token gateway on the destination
+   **/
+  | { name: 'Teleport'; params: { params: PalletTokenGatewayTeleportParams } }
+  /**
+   * Set the token gateway address for specified chains
+   **/
+  | { name: 'SetTokenGatewayAddresses'; params: { addresses: Array<[IsmpHostStateMachine, BytesLike]> } }
+  /**
+   * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+   *
+   * This works by dispatching a request to the TokenGateway module on each requested chain
+   * to create the asset.
+   * `native` should be true if this asset originates from this chain
+   **/
+  | { name: 'CreateErc6160Asset'; params: { asset: PalletTokenGatewayAssetRegistration } }
+  /**
+   * Registers a multi-chain ERC6160 asset. The asset should not already exist.
+   *
+   * This works by dispatching a request to the TokenGateway module on each requested chain
+   * to create the asset.
+   **/
+  | { name: 'UpdateErc6160Asset'; params: { asset: TokenGatewayPrimitivesGatewayAssetUpdate } }
+  /**
+   * Update the precision for an existing asset
+   **/
+  | { name: 'UpdateAssetPrecision'; params: { update: PalletTokenGatewayPrecisionUpdate } };
+
+export type PalletTokenGatewayTeleportParams = {
+  assetId: number;
+  destination: IsmpHostStateMachine;
+  recepient: H256;
+  amount: bigint;
+  timeout: bigint;
+  tokenGateway: Bytes;
+  relayerFee: bigint;
+  callData?: Bytes | undefined;
+  redeem: boolean;
+};
+
+export type PalletTokenGatewayAssetRegistration = {
+  localId: number;
+  reg: TokenGatewayPrimitivesGatewayAssetRegistration;
+  native: boolean;
+  precision: Array<[IsmpHostStateMachine, number]>;
+};
+
+export type TokenGatewayPrimitivesGatewayAssetRegistration = {
+  name: Bytes;
+  symbol: Bytes;
+  chains: Array<IsmpHostStateMachine>;
+  minimumBalance?: bigint | undefined;
+};
+
+export type TokenGatewayPrimitivesGatewayAssetUpdate = {
+  assetId: H256;
+  addChains: Array<IsmpHostStateMachine>;
+  removeChains: Array<IsmpHostStateMachine>;
+  newAdmins: Array<[IsmpHostStateMachine, H160]>;
+};
+
+export type PalletTokenGatewayPrecisionUpdate = { assetId: number; precisions: Array<[IsmpHostStateMachine, number]> };
+
 /**
  * Contains a variant per dispatchable extrinsic that this pallet has.
  **/
@@ -14561,6 +14968,7 @@ export type PalletHsmEvent =
    * - `max_buy_price_coefficient`: New max buy price coefficient if updated (None if not changed)
    * - `buy_back_fee`: New buy back fee if updated (None if not changed)
    * - `buyback_rate`: New buyback rate if updated (None if not changed)
+   * - `max_in_holding`: New max collateral holding if updated (None if not changed)
    **/
   | {
       name: 'CollateralUpdated';
@@ -14570,6 +14978,7 @@ export type PalletHsmEvent =
         maxBuyPriceCoefficient?: FixedU128 | undefined;
         buyBackFee?: Permill | undefined;
         buybackRate?: Perbill | undefined;
+        maxInHolding?: bigint | undefined | undefined;
       };
     }
   /**
@@ -15502,6 +15911,356 @@ export type PalletSessionEvent =
    **/
   { name: 'NewSession'; data: { sessionIndex: number } };
 
+/**
+ * Pallet Events
+ **/
+export type PalletIsmpEvent =
+  /**
+   * Emitted when a state machine is successfully updated to a new height
+   **/
+  | {
+      name: 'StateMachineUpdated';
+      data: {
+        /**
+         * State machine identifier
+         **/
+        stateMachineId: IsmpConsensusStateMachineId;
+
+        /**
+         * State machine latest height
+         **/
+        latestHeight: bigint;
+      };
+    }
+  /**
+   * Emitted when a state commitment is vetoed by a fisherman
+   **/
+  | {
+      name: 'StateCommitmentVetoed';
+      data: {
+        /**
+         * State machine height
+         **/
+        height: IsmpConsensusStateMachineHeight;
+
+        /**
+         * responsible fisherman
+         **/
+        fisherman: Bytes;
+      };
+    }
+  /**
+   * Indicates that a consensus client has been created
+   **/
+  | {
+      name: 'ConsensusClientCreated';
+      data: {
+        /**
+         * Consensus client id
+         **/
+        consensusClientId: FixedBytes<4>;
+      };
+    }
+  /**
+   * Indicates that a consensus client has been created
+   **/
+  | {
+      name: 'ConsensusClientFrozen';
+      data: {
+        /**
+         * Consensus client id
+         **/
+        consensusClientId: FixedBytes<4>;
+      };
+    }
+  /**
+   * An Outgoing Response has been deposited
+   **/
+  | {
+      name: 'Response';
+      data: {
+        /**
+         * Chain that this response will be routed to
+         **/
+        destChain: IsmpHostStateMachine;
+
+        /**
+         * Source Chain for this response
+         **/
+        sourceChain: IsmpHostStateMachine;
+
+        /**
+         * Nonce for the request which this response is for
+         **/
+        requestNonce: bigint;
+
+        /**
+         * Response Commitment
+         **/
+        commitment: H256;
+
+        /**
+         * Request commitment
+         **/
+        reqCommitment: H256;
+      };
+    }
+  /**
+   * An Outgoing Request has been deposited
+   **/
+  | {
+      name: 'Request';
+      data: {
+        /**
+         * Chain that this request will be routed to
+         **/
+        destChain: IsmpHostStateMachine;
+
+        /**
+         * Source Chain for request
+         **/
+        sourceChain: IsmpHostStateMachine;
+
+        /**
+         * Request nonce
+         **/
+        requestNonce: bigint;
+
+        /**
+         * Commitment
+         **/
+        commitment: H256;
+      };
+    }
+  /**
+   * Some errors handling some ismp messages
+   **/
+  | {
+      name: 'Errors';
+      data: {
+        /**
+         * Message handling errors
+         **/
+        errors: Array<PalletIsmpErrorsHandlingError>;
+      };
+    }
+  /**
+   * Post Request Handled
+   **/
+  | { name: 'PostRequestHandled'; data: IsmpEventsRequestResponseHandled }
+  /**
+   * Post Response Handled
+   **/
+  | { name: 'PostResponseHandled'; data: IsmpEventsRequestResponseHandled }
+  /**
+   * Get Response Handled
+   **/
+  | { name: 'GetRequestHandled'; data: IsmpEventsRequestResponseHandled }
+  /**
+   * Post request timeout handled
+   **/
+  | { name: 'PostRequestTimeoutHandled'; data: IsmpEventsTimeoutHandled }
+  /**
+   * Post response timeout handled
+   **/
+  | { name: 'PostResponseTimeoutHandled'; data: IsmpEventsTimeoutHandled }
+  /**
+   * Get request timeout handled
+   **/
+  | { name: 'GetRequestTimeoutHandled'; data: IsmpEventsTimeoutHandled };
+
+export type PalletIsmpErrorsHandlingError = { message: Bytes };
+
+export type IsmpEventsRequestResponseHandled = { commitment: H256; relayer: Bytes };
+
+export type IsmpEventsTimeoutHandled = { commitment: H256; source: IsmpHostStateMachine; dest: IsmpHostStateMachine };
+
+/**
+ * Events emitted by this pallet
+ **/
+export type IsmpParachainEvent =
+  /**
+   * Parachains with the `para_ids` have been added to the whitelist
+   **/
+  | {
+      name: 'ParachainsAdded';
+      data: {
+        /**
+         * The parachains in question
+         **/
+        paraIds: Array<IsmpParachainParachainData>;
+      };
+    }
+  /**
+   * Parachains with the `para_ids` have been removed from the whitelist
+   **/
+  | {
+      name: 'ParachainsRemoved';
+      data: {
+        /**
+         * The parachains in question
+         **/
+        paraIds: Array<number>;
+      };
+    };
+
+/**
+ * The `Event` enum of this pallet
+ **/
+export type PalletHyperbridgeEvent =
+  /**
+   * Hyperbridge governance has now updated it's host params on this chain.
+   **/
+  | {
+      name: 'HostParamsUpdated';
+      data: {
+        /**
+         * The old host params
+         **/
+        old: PalletHyperbridgeVersionedHostParams;
+
+        /**
+         * The new host params
+         **/
+        new: PalletHyperbridgeVersionedHostParams;
+      };
+    }
+  /**
+   * A relayer has withdrawn some fees
+   **/
+  | {
+      name: 'RelayerFeeWithdrawn';
+      data: {
+        /**
+         * The amount that was withdrawn
+         **/
+        amount: bigint;
+
+        /**
+         * The withdrawal beneficiary
+         **/
+        account: AccountId32;
+      };
+    }
+  /**
+   * Hyperbridge has withdrawn it's protocol revenue
+   **/
+  | {
+      name: 'ProtocolRevenueWithdrawn';
+      data: {
+        /**
+         * The amount that was withdrawn
+         **/
+        amount: bigint;
+
+        /**
+         * The withdrawal beneficiary
+         **/
+        account: AccountId32;
+      };
+    };
+
+export type PalletHyperbridgeVersionedHostParams = { type: 'V1'; value: PalletHyperbridgeSubstrateHostParams };
+
+export type PalletHyperbridgeSubstrateHostParams = {
+  defaultPerByteFee: bigint;
+  perByteFees: Array<[IsmpHostStateMachine, bigint]>;
+  assetRegistrationFee: bigint;
+};
+
+/**
+ * Pallet events that functions in this pallet can emit.
+ **/
+export type PalletTokenGatewayEvent =
+  /**
+   * An asset has been teleported
+   **/
+  | {
+      name: 'AssetTeleported';
+      data: {
+        /**
+         * Source account
+         **/
+        from: AccountId32;
+
+        /**
+         * beneficiary account on destination
+         **/
+        to: H256;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        dest: IsmpHostStateMachine;
+
+        /**
+         * Request commitment
+         **/
+        commitment: H256;
+      };
+    }
+  /**
+   * An asset has been received and transferred to the beneficiary's account
+   **/
+  | {
+      name: 'AssetReceived';
+      data: {
+        /**
+         * beneficiary account on relaychain
+         **/
+        beneficiary: AccountId32;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        source: IsmpHostStateMachine;
+      };
+    }
+  /**
+   * An asset has been refunded and transferred to the beneficiary's account
+   **/
+  | {
+      name: 'AssetRefunded';
+      data: {
+        /**
+         * beneficiary account on relaychain
+         **/
+        beneficiary: AccountId32;
+
+        /**
+         * Amount transferred
+         **/
+        amount: bigint;
+
+        /**
+         * Destination chain
+         **/
+        source: IsmpHostStateMachine;
+      };
+    }
+  /**
+   * ERC6160 asset creation request dispatched to hyperbridge
+   **/
+  | {
+      name: 'Erc6160AssetRegistrationDispatched';
+      data: {
+        /**
+         * Request commitment
+         **/
+        commitment: H256;
+      };
+    };
+
 /**
  * The `Event` enum of this pallet
  **/
@@ -16917,23 +17676,23 @@ export type PalletDusterError =
   /**
    * Account is excluded from dusting.
    **/
-  | 'AccountBlacklisted'
+  | 'AccountWhitelisted'
   /**
    * Account is not present in the non-dustable list.
    **/
-  | 'AccountNotBlacklisted'
+  | 'AccountNotWhitelisted'
   /**
    * The balance is zero.
    **/
   | 'ZeroBalance'
   /**
-   * The balance is sufficient to keep account open.
+   * The balance was not fully dusted, there is some leftover on the account. Normally, it should never happen.
    **/
-  | 'BalanceSufficient'
+  | 'NonZeroBalance'
   /**
-   * Dust account is not set.
+   * The balance is sufficient to keep account open.
    **/
-  | 'DustAccountNotSet'
+  | 'BalanceSufficient'
   /**
    * Reserve account is not set.
    **/
@@ -18001,12 +18760,6 @@ export type PalletHsmError =
    * There is no profitable arbitrage opportunity for the specified collateral.
    **/
   | 'NoArbitrageOpportunity'
-  /**
-   * Offchain lock error
-   *
-   * Failed to acquire the lock for offchain workers, likely because another operation is in progress.
-   **/
-  | 'OffchainLockError'
   /**
    * Asset not in the pool
    *
@@ -19068,6 +19821,77 @@ export type PalletSessionError =
 
 export type SpConsensusSlotsSlot = bigint;
 
+/**
+ * Pallet errors
+ **/
+export type PalletIsmpError =
+  /**
+   * Invalid ISMP message
+   **/
+  | 'InvalidMessage'
+  /**
+   * Requested message was not found
+   **/
+  | 'MessageNotFound'
+  /**
+   * Encountered an error while creating the consensus client.
+   **/
+  | 'ConsensusClientCreationFailed'
+  /**
+   * Couldn't update unbonding period
+   **/
+  | 'UnbondingPeriodUpdateFailed'
+  /**
+   * Couldn't update challenge period
+   **/
+  | 'ChallengePeriodUpdateFailed';
+
+/**
+ * The `Error` enum of this pallet.
+ **/
+export type PalletHyperbridgeError = null;
+
+/**
+ * Errors that can be returned by this pallet.
+ **/
+export type PalletTokenGatewayError =
+  /**
+   * A asset that has not been registered
+   **/
+  | 'UnregisteredAsset'
+  /**
+   * Error while teleporting asset
+   **/
+  | 'AssetTeleportError'
+  /**
+   * Coprocessor was not configured in the runtime
+   **/
+  | 'CoprocessorNotConfigured'
+  /**
+   * Asset or update Dispatch Error
+   **/
+  | 'DispatchError'
+  /**
+   * Asset Id creation failed
+   **/
+  | 'AssetCreationError'
+  /**
+   * Asset decimals not found
+   **/
+  | 'AssetDecimalsNotFound'
+  /**
+   * Protocol Params have not been initialized
+   **/
+  | 'NotInitialized'
+  /**
+   * Unknown Asset
+   **/
+  | 'UnknownAsset'
+  /**
+   * Only root or asset owner can update asset
+   **/
+  | 'NotAssetOwner';
+
 export type PalletEmaOracleOracleEntry = {
   price: HydraDxMathRatio;
   volume: HydradxTraitsOracleVolume;
@@ -19268,6 +20092,26 @@ export type HydradxRuntimeEvmAaveTradeExecutorPoolData = {
   liqudityOut: bigint;
 };
 
+export type IsmpEventsEvent =
+  | { type: 'StateMachineUpdated'; value: IsmpEventsStateMachineUpdated }
+  | { type: 'StateCommitmentVetoed'; value: IsmpEventsStateCommitmentVetoed }
+  | { type: 'PostRequest'; value: IsmpRouterPostRequest }
+  | { type: 'PostResponse'; value: IsmpRouterPostResponse }
+  | { type: 'GetResponse'; value: IsmpRouterGetResponse }
+  | { type: 'GetRequest'; value: IsmpRouterGetRequest }
+  | { type: 'PostRequestHandled'; value: IsmpEventsRequestResponseHandled }
+  | { type: 'PostResponseHandled'; value: IsmpEventsRequestResponseHandled }
+  | { type: 'PostRequestTimeoutHandled'; value: IsmpEventsTimeoutHandled }
+  | { type: 'PostResponseTimeoutHandled'; value: IsmpEventsTimeoutHandled }
+  | { type: 'GetRequestHandled'; value: IsmpEventsRequestResponseHandled }
+  | { type: 'GetRequestTimeoutHandled'; value: IsmpEventsTimeoutHandled };
+
+export type IsmpEventsStateMachineUpdated = { stateMachineId: IsmpConsensusStateMachineId; latestHeight: bigint };
+
+export type IsmpEventsStateCommitmentVetoed = { height: IsmpConsensusStateMachineHeight; fisherman: Bytes };
+
+export type CumulusPalletParachainSystemRelayChainState = { number: number; stateRoot: H256 };
+
 export type HydradxRuntimeRuntimeError =
   | { pallet: 'System'; palletError: FrameSystemError }
   | { pallet: 'Balances'; palletError: PalletBalancesError }
@@ -19327,5 +20171,8 @@ export type HydradxRuntimeRuntimeError =
   | { pallet: 'UnknownTokens'; palletError: OrmlUnknownTokensModuleError }
   | { pallet: 'CollatorSelection'; palletError: PalletCollatorSelectionError }
   | { pallet: 'Session'; palletError: PalletSessionError }
+  | { pallet: 'Ismp'; palletError: PalletIsmpError }
+  | { pallet: 'Hyperbridge'; palletError: PalletHyperbridgeError }
+  | { pallet: 'TokenGateway'; palletError: PalletTokenGatewayError }
   | { pallet: 'EmaOracle'; palletError: PalletEmaOracleError }
   | { pallet: 'Broadcast'; palletError: PalletBroadcastError };
diff --git a/packages/chaintypes/src/hydration/view-functions.d.ts b/packages/chaintypes/src/hydration/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/hydration/view-functions.d.ts
+++ b/packages/chaintypes/src/hydration/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/kusama-asset-hub/consts.d.ts b/packages/chaintypes/src/kusama-asset-hub/consts.d.ts
index f24f7dd2..591eef9b 100644
--- a/packages/chaintypes/src/kusama-asset-hub/consts.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Bytes, AccountId32, Permill, Perbill } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -15,7 +15,7 @@ import type {
   PalletReferendaTrackDetails,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/kusama-asset-hub/errors.d.ts b/packages/chaintypes/src/kusama-asset-hub/errors.d.ts
index aad31e1d..1c9bde9e 100644
--- a/packages/chaintypes/src/kusama-asset-hub/errors.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,65 +11,65 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * The specified [`Task`] is not valid.
      **/
-    InvalidTask: GenericPalletError<Rv>;
+    InvalidTask: GenericPalletError;
 
     /**
      * The specified [`Task`] failed during execution.
      **/
-    FailedTask: GenericPalletError<Rv>;
+    FailedTask: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -78,38 +78,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -118,12 +118,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -132,47 +132,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -181,32 +181,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -215,67 +215,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -284,33 +284,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -319,38 +319,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -359,92 +359,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -453,32 +453,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -487,32 +487,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -522,152 +522,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -677,32 +677,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -710,24 +710,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -736,12 +736,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -750,78 +750,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -830,47 +830,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RemoteProxyRelayChain`'s errors
@@ -879,42 +879,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The local account id could not converted to the remote account id.
      **/
-    CouldNotConvertLocalToRemoteAccountId: GenericPalletError<Rv>;
+    CouldNotConvertLocalToRemoteAccountId: GenericPalletError;
 
     /**
      * The anchor block of the remote proof is unknown.
      **/
-    UnknownProofAnchorBlock: GenericPalletError<Rv>;
+    UnknownProofAnchorBlock: GenericPalletError;
 
     /**
      * The proxy definition could not be found in the proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * Failed to decode the remote proxy definition from the proof.
      **/
-    ProxyDefinitionDecodingFailed: GenericPalletError<Rv>;
+    ProxyDefinitionDecodingFailed: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Could not find any matching proxy definition in the proof.
      **/
-    DidNotFindMatchingProxyDefinition: GenericPalletError<Rv>;
+    DidNotFindMatchingProxyDefinition: GenericPalletError;
 
     /**
      * Proxy proof not registered.
      **/
-    ProxyProofNotRegistered: GenericPalletError<Rv>;
+    ProxyProofNotRegistered: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -923,32 +923,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -957,125 +957,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -1084,117 +1084,117 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * No metadata is found.
      **/
-    NoMetadata: GenericPalletError<Rv>;
+    NoMetadata: GenericPalletError;
 
     /**
      * Wrong metadata key/value bytes supplied.
      **/
-    WrongMetadata: GenericPalletError<Rv>;
+    WrongMetadata: GenericPalletError;
 
     /**
      * An attribute is not found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Wrong attribute key/value bytes supplied.
      **/
-    WrongAttribute: GenericPalletError<Rv>;
+    WrongAttribute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nfts`'s errors
@@ -1203,232 +1203,232 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The approval had a deadline that expired, so the approval isn't valid anymore.
      **/
-    ApprovalExpired: GenericPalletError<Rv>;
+    ApprovalExpired: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * The witness data given does not match the current state of the chain.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Collection ID is already taken.
      **/
-    CollectionIdInUse: GenericPalletError<Rv>;
+    CollectionIdInUse: GenericPalletError;
 
     /**
      * Items within that collection are non-transferable.
      **/
-    ItemsNonTransferable: GenericPalletError<Rv>;
+    ItemsNonTransferable: GenericPalletError;
 
     /**
      * The provided account is not a delegate.
      **/
-    NotDelegate: GenericPalletError<Rv>;
+    NotDelegate: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership acceptance of the collection.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked (non-transferable).
      **/
-    ItemLocked: GenericPalletError<Rv>;
+    ItemLocked: GenericPalletError;
 
     /**
      * Item's attributes are locked.
      **/
-    LockedItemAttributes: GenericPalletError<Rv>;
+    LockedItemAttributes: GenericPalletError;
 
     /**
      * Collection's attributes are locked.
      **/
-    LockedCollectionAttributes: GenericPalletError<Rv>;
+    LockedCollectionAttributes: GenericPalletError;
 
     /**
      * Item's metadata is locked.
      **/
-    LockedItemMetadata: GenericPalletError<Rv>;
+    LockedItemMetadata: GenericPalletError;
 
     /**
      * Collection's metadata is locked.
      **/
-    LockedCollectionMetadata: GenericPalletError<Rv>;
+    LockedCollectionMetadata: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply is locked and can't be changed.
      **/
-    MaxSupplyLocked: GenericPalletError<Rv>;
+    MaxSupplyLocked: GenericPalletError;
 
     /**
      * The provided max supply is less than the number of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Swap doesn't exist.
      **/
-    UnknownSwap: GenericPalletError<Rv>;
+    UnknownSwap: GenericPalletError;
 
     /**
      * The given item has no metadata set.
      **/
-    MetadataNotFound: GenericPalletError<Rv>;
+    MetadataNotFound: GenericPalletError;
 
     /**
      * The provided attribute can't be found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * The item has reached its approval limit.
      **/
-    ReachedApprovalLimit: GenericPalletError<Rv>;
+    ReachedApprovalLimit: GenericPalletError;
 
     /**
      * The deadline has already expired.
      **/
-    DeadlineExpired: GenericPalletError<Rv>;
+    DeadlineExpired: GenericPalletError;
 
     /**
      * The duration provided should be less than or equal to `MaxDeadlineDuration`.
      **/
-    WrongDuration: GenericPalletError<Rv>;
+    WrongDuration: GenericPalletError;
 
     /**
      * The method is disabled by system settings.
      **/
-    MethodDisabled: GenericPalletError<Rv>;
+    MethodDisabled: GenericPalletError;
 
     /**
      * The provided setting can't be set.
      **/
-    WrongSetting: GenericPalletError<Rv>;
+    WrongSetting: GenericPalletError;
 
     /**
      * Item's config already exists and should be equal to the provided one.
      **/
-    InconsistentItemConfig: GenericPalletError<Rv>;
+    InconsistentItemConfig: GenericPalletError;
 
     /**
      * Config for a collection or an item can't be found.
      **/
-    NoConfig: GenericPalletError<Rv>;
+    NoConfig: GenericPalletError;
 
     /**
      * Some roles were not cleared.
      **/
-    RolesNotCleared: GenericPalletError<Rv>;
+    RolesNotCleared: GenericPalletError;
 
     /**
      * Mint has not started yet.
      **/
-    MintNotStarted: GenericPalletError<Rv>;
+    MintNotStarted: GenericPalletError;
 
     /**
      * Mint has already ended.
      **/
-    MintEnded: GenericPalletError<Rv>;
+    MintEnded: GenericPalletError;
 
     /**
      * The provided Item was already used for claiming.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * The provided data is incorrect.
      **/
-    IncorrectData: GenericPalletError<Rv>;
+    IncorrectData: GenericPalletError;
 
     /**
      * The extrinsic was sent by the wrong origin.
      **/
-    WrongOrigin: GenericPalletError<Rv>;
+    WrongOrigin: GenericPalletError;
 
     /**
      * The provided signature is incorrect.
      **/
-    WrongSignature: GenericPalletError<Rv>;
+    WrongSignature: GenericPalletError;
 
     /**
      * The provided metadata might be too long.
      **/
-    IncorrectMetadata: GenericPalletError<Rv>;
+    IncorrectMetadata: GenericPalletError;
 
     /**
      * Can't set more attributes per one call.
      **/
-    MaxAttributesLimitReached: GenericPalletError<Rv>;
+    MaxAttributesLimitReached: GenericPalletError;
 
     /**
      * The provided namespace isn't supported in this call.
      **/
-    WrongNamespace: GenericPalletError<Rv>;
+    WrongNamespace: GenericPalletError;
 
     /**
      * Can't delete non-empty collections.
      **/
-    CollectionNotEmpty: GenericPalletError<Rv>;
+    CollectionNotEmpty: GenericPalletError;
 
     /**
      * The witness data should be provided.
      **/
-    WitnessRequired: GenericPalletError<Rv>;
+    WitnessRequired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ForeignAssets`'s errors
@@ -1437,125 +1437,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NftFractionalization`'s errors
@@ -1564,27 +1564,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID does not correspond to locked NFT.
      **/
-    IncorrectAssetId: GenericPalletError<Rv>;
+    IncorrectAssetId: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * NFT doesn't exist.
      **/
-    NftNotFound: GenericPalletError<Rv>;
+    NftNotFound: GenericPalletError;
 
     /**
      * NFT has not yet been fractionalised.
      **/
-    NftNotFractionalized: GenericPalletError<Rv>;
+    NftNotFractionalized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssets`'s errors
@@ -1593,125 +1593,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversion`'s errors
@@ -1720,125 +1720,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Pool already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Desired amount can't be zero.
      **/
-    WrongDesiredAmount: GenericPalletError<Rv>;
+    WrongDesiredAmount: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountOneLessThanMinimal: GenericPalletError<Rv>;
+    AmountOneLessThanMinimal: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountTwoLessThanMinimal: GenericPalletError<Rv>;
+    AmountTwoLessThanMinimal: GenericPalletError;
 
     /**
      * Reserve needs to always be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    ReserveLeftLessThanMinimal: GenericPalletError<Rv>;
+    ReserveLeftLessThanMinimal: GenericPalletError;
 
     /**
      * Desired amount can't be equal to the pool reserve.
      **/
-    AmountOutTooHigh: GenericPalletError<Rv>;
+    AmountOutTooHigh: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An overflow happened.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * Optimal calculated amount is less than desired.
      **/
-    OptimalAmountLessThanDesired: GenericPalletError<Rv>;
+    OptimalAmountLessThanDesired: GenericPalletError;
 
     /**
      * Insufficient liquidity minted.
      **/
-    InsufficientLiquidityMinted: GenericPalletError<Rv>;
+    InsufficientLiquidityMinted: GenericPalletError;
 
     /**
      * Requested liquidity can't be zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * Amount can't be zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Calculated amount out is less than provided minimum amount.
      **/
-    ProvidedMinimumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMinimumNotSufficientForSwap: GenericPalletError;
 
     /**
      * Provided maximum amount is not sufficient for swap.
      **/
-    ProvidedMaximumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMaximumNotSufficientForSwap: GenericPalletError;
 
     /**
      * The provided path must consists of 2 assets at least.
      **/
-    InvalidPath: GenericPalletError<Rv>;
+    InvalidPath: GenericPalletError;
 
     /**
      * The provided path must consists of unique assets.
      **/
-    NonUniquePath: GenericPalletError<Rv>;
+    NonUniquePath: GenericPalletError;
 
     /**
      * It was not possible to get or increment the Id of the pool.
      **/
-    IncorrectPoolAssetId: GenericPalletError<Rv>;
+    IncorrectPoolAssetId: GenericPalletError;
 
     /**
      * The destination account cannot exist with the swapped funds.
      **/
-    BelowMinimum: GenericPalletError<Rv>;
+    BelowMinimum: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Recovery`'s errors
@@ -1847,87 +1847,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not allowed to make a call on behalf of this account
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Threshold must be greater than zero
      **/
-    ZeroThreshold: GenericPalletError<Rv>;
+    ZeroThreshold: GenericPalletError;
 
     /**
      * Friends list must be greater than zero and threshold
      **/
-    NotEnoughFriends: GenericPalletError<Rv>;
+    NotEnoughFriends: GenericPalletError;
 
     /**
      * Friends list must be less than max friends
      **/
-    MaxFriends: GenericPalletError<Rv>;
+    MaxFriends: GenericPalletError;
 
     /**
      * Friends list must be sorted and free of duplicates
      **/
-    NotSorted: GenericPalletError<Rv>;
+    NotSorted: GenericPalletError;
 
     /**
      * This account is not set up for recovery
      **/
-    NotRecoverable: GenericPalletError<Rv>;
+    NotRecoverable: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyRecoverable: GenericPalletError<Rv>;
+    AlreadyRecoverable: GenericPalletError;
 
     /**
      * A recovery process has already started for this account
      **/
-    AlreadyStarted: GenericPalletError<Rv>;
+    AlreadyStarted: GenericPalletError;
 
     /**
      * A recovery process has not started for this rescuer
      **/
-    NotStarted: GenericPalletError<Rv>;
+    NotStarted: GenericPalletError;
 
     /**
      * This account is not a friend who can vouch
      **/
-    NotFriend: GenericPalletError<Rv>;
+    NotFriend: GenericPalletError;
 
     /**
      * The friend must wait until the delay period to vouch for this recovery
      **/
-    DelayPeriod: GenericPalletError<Rv>;
+    DelayPeriod: GenericPalletError;
 
     /**
      * This user has already vouched for this recovery
      **/
-    AlreadyVouched: GenericPalletError<Rv>;
+    AlreadyVouched: GenericPalletError;
 
     /**
      * The threshold for recovering this account has not been met
      **/
-    Threshold: GenericPalletError<Rv>;
+    Threshold: GenericPalletError;
 
     /**
      * There are still active recovery attempts that need to be closed
      **/
-    StillActive: GenericPalletError<Rv>;
+    StillActive: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyProxy: GenericPalletError<Rv>;
+    AlreadyProxy: GenericPalletError;
 
     /**
      * Some internal state is broken.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Society`'s errors
@@ -1936,172 +1936,172 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * User is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * User is suspended.
      **/
-    Suspended: GenericPalletError<Rv>;
+    Suspended: GenericPalletError;
 
     /**
      * User is not suspended.
      **/
-    NotSuspended: GenericPalletError<Rv>;
+    NotSuspended: GenericPalletError;
 
     /**
      * Nothing to payout.
      **/
-    NoPayout: GenericPalletError<Rv>;
+    NoPayout: GenericPalletError;
 
     /**
      * Society already founded.
      **/
-    AlreadyFounded: GenericPalletError<Rv>;
+    AlreadyFounded: GenericPalletError;
 
     /**
      * Not enough in pot to accept candidate.
      **/
-    InsufficientPot: GenericPalletError<Rv>;
+    InsufficientPot: GenericPalletError;
 
     /**
      * Member is already vouching or banned from vouching again.
      **/
-    AlreadyVouching: GenericPalletError<Rv>;
+    AlreadyVouching: GenericPalletError;
 
     /**
      * Member is not vouching.
      **/
-    NotVouchingOnBidder: GenericPalletError<Rv>;
+    NotVouchingOnBidder: GenericPalletError;
 
     /**
      * Cannot remove the head of the chain.
      **/
-    Head: GenericPalletError<Rv>;
+    Head: GenericPalletError;
 
     /**
      * Cannot remove the founder.
      **/
-    Founder: GenericPalletError<Rv>;
+    Founder: GenericPalletError;
 
     /**
      * User has already made a bid.
      **/
-    AlreadyBid: GenericPalletError<Rv>;
+    AlreadyBid: GenericPalletError;
 
     /**
      * User is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * User is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * Too many members in the society.
      **/
-    MaxMembers: GenericPalletError<Rv>;
+    MaxMembers: GenericPalletError;
 
     /**
      * The caller is not the founder.
      **/
-    NotFounder: GenericPalletError<Rv>;
+    NotFounder: GenericPalletError;
 
     /**
      * The caller is not the head.
      **/
-    NotHead: GenericPalletError<Rv>;
+    NotHead: GenericPalletError;
 
     /**
      * The membership cannot be claimed as the candidate was not clearly approved.
      **/
-    NotApproved: GenericPalletError<Rv>;
+    NotApproved: GenericPalletError;
 
     /**
      * The candidate cannot be kicked as the candidate was not clearly rejected.
      **/
-    NotRejected: GenericPalletError<Rv>;
+    NotRejected: GenericPalletError;
 
     /**
      * The candidacy cannot be dropped as the candidate was clearly approved.
      **/
-    Approved: GenericPalletError<Rv>;
+    Approved: GenericPalletError;
 
     /**
      * The candidacy cannot be bestowed as the candidate was clearly rejected.
      **/
-    Rejected: GenericPalletError<Rv>;
+    Rejected: GenericPalletError;
 
     /**
      * The candidacy cannot be concluded as the voting is still in progress.
      **/
-    InProgress: GenericPalletError<Rv>;
+    InProgress: GenericPalletError;
 
     /**
      * The candidacy cannot be pruned until a full additional intake period has passed.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The skeptic already voted.
      **/
-    Voted: GenericPalletError<Rv>;
+    Voted: GenericPalletError;
 
     /**
      * The skeptic need not vote on candidates from expired rounds.
      **/
-    Expired: GenericPalletError<Rv>;
+    Expired: GenericPalletError;
 
     /**
      * User is not a bidder.
      **/
-    NotBidder: GenericPalletError<Rv>;
+    NotBidder: GenericPalletError;
 
     /**
      * There is no defender currently.
      **/
-    NoDefender: GenericPalletError<Rv>;
+    NoDefender: GenericPalletError;
 
     /**
      * Group doesn't exist.
      **/
-    NotGroup: GenericPalletError<Rv>;
+    NotGroup: GenericPalletError;
 
     /**
      * The member is already elevated to this rank.
      **/
-    AlreadyElevated: GenericPalletError<Rv>;
+    AlreadyElevated: GenericPalletError;
 
     /**
      * The skeptic has already been punished for this offence.
      **/
-    AlreadyPunished: GenericPalletError<Rv>;
+    AlreadyPunished: GenericPalletError;
 
     /**
      * Funds are insufficient to pay off society debts.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The candidate/defender has no stale votes to remove.
      **/
-    NoVotes: GenericPalletError<Rv>;
+    NoVotes: GenericPalletError;
 
     /**
      * There is no deposit associated with a bid.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Revive`'s errors
@@ -2110,122 +2110,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * Event body or storage item exceeds [`limits::PAYLOAD_BYTES`].
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract called into the runtime which then called back into this pallet.
      **/
-    ReenteredPallet: GenericPalletError<Rv>;
+    ReenteredPallet: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -2233,7 +2233,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract failed to compile or is missing the correct entry points.
@@ -2241,120 +2241,120 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::revive=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * The code blob supplied is larger than [`limits::code::BLOB_BYTES`].
      **/
-    BlobTooLarge: GenericPalletError<Rv>;
+    BlobTooLarge: GenericPalletError;
 
     /**
      * The contract declares too much memory (ro + rw + stack).
      **/
-    StaticMemoryTooLarge: GenericPalletError<Rv>;
+    StaticMemoryTooLarge: GenericPalletError;
 
     /**
      * The program contains a basic block that is larger than allowed.
      **/
-    BasicBlockTooLarge: GenericPalletError<Rv>;
+    BasicBlockTooLarge: GenericPalletError;
 
     /**
      * The program contains an invalid instruction.
      **/
-    InvalidInstruction: GenericPalletError<Rv>;
+    InvalidInstruction: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * The contract tried to call a syscall which does not exist (at its current api level).
      **/
-    InvalidSyscall: GenericPalletError<Rv>;
+    InvalidSyscall: GenericPalletError;
 
     /**
      * Invalid storage flags were passed to one of the storage syscalls.
      **/
-    InvalidStorageFlags: GenericPalletError<Rv>;
+    InvalidStorageFlags: GenericPalletError;
 
     /**
      * PolkaVM failed during code execution. Probably due to a malformed program.
      **/
-    ExecutionFailed: GenericPalletError<Rv>;
+    ExecutionFailed: GenericPalletError;
 
     /**
      * Failed to convert a U256 to a Balance.
      **/
-    BalanceConversionFailed: GenericPalletError<Rv>;
+    BalanceConversionFailed: GenericPalletError;
 
     /**
      * Immutable data can only be set during deploys and only be read during calls.
      * Additionally, it is only valid to set the data once and it must not be empty.
      **/
-    InvalidImmutableAccess: GenericPalletError<Rv>;
+    InvalidImmutableAccess: GenericPalletError;
 
     /**
      * An `AccountID32` account tried to interact with the pallet without having a mapping.
      *
      * Call [`Pallet::map_account`] in order to create a mapping for the account.
      **/
-    AccountUnmapped: GenericPalletError<Rv>;
+    AccountUnmapped: GenericPalletError;
 
     /**
      * Tried to map an account that is already mapped.
      **/
-    AccountAlreadyMapped: GenericPalletError<Rv>;
+    AccountAlreadyMapped: GenericPalletError;
 
     /**
      * The transaction used to dry-run a contract is invalid.
      **/
-    InvalidGenericTransaction: GenericPalletError<Rv>;
+    InvalidGenericTransaction: GenericPalletError;
 
     /**
      * The refcount of a code either over or underflowed.
      **/
-    RefcountOverOrUnderflow: GenericPalletError<Rv>;
+    RefcountOverOrUnderflow: GenericPalletError;
 
     /**
      * Unsupported precompile address.
      **/
-    UnsupportedPrecompileAddress: GenericPalletError<Rv>;
+    UnsupportedPrecompileAddress: GenericPalletError;
 
     /**
      * The calldata exceeds [`limits::CALLDATA_BYTES`].
      **/
-    CallDataTooLarge: GenericPalletError<Rv>;
+    CallDataTooLarge: GenericPalletError;
 
     /**
      * The return data exceeds [`limits::CALLDATA_BYTES`].
      **/
-    ReturnDataTooLarge: GenericPalletError<Rv>;
+    ReturnDataTooLarge: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2363,7 +2363,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2374,32 +2374,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -2408,44 +2408,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -2454,160 +2454,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -2616,17 +2616,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -2635,17 +2635,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -2654,52 +2654,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElection`'s errors
@@ -2708,22 +2708,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Triggering the `Fallback` failed.
      **/
-    Fallback: GenericPalletError<Rv>;
+    Fallback: GenericPalletError;
 
     /**
      * Unexpected phase
      **/
-    UnexpectedPhase: GenericPalletError<Rv>;
+    UnexpectedPhase: GenericPalletError;
 
     /**
      * Snapshot was unavailable.
      **/
-    Snapshot: GenericPalletError<Rv>;
+    Snapshot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s errors
@@ -2732,52 +2732,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The phase is not signed.
      **/
-    PhaseNotSigned: GenericPalletError<Rv>;
+    PhaseNotSigned: GenericPalletError;
 
     /**
      * The submission is a duplicate.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * The queue is full.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The page index is out of bounds.
      **/
-    BadPageIndex: GenericPalletError<Rv>;
+    BadPageIndex: GenericPalletError;
 
     /**
      * The account is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * No submission found.
      **/
-    NoSubmission: GenericPalletError<Rv>;
+    NoSubmission: GenericPalletError;
 
     /**
      * Round is not yet over.
      **/
-    RoundNotOver: GenericPalletError<Rv>;
+    RoundNotOver: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitnessData: GenericPalletError<Rv>;
+    BadWitnessData: GenericPalletError;
 
     /**
      * Too many invulnerable accounts are provided,
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -2786,193 +2786,193 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record not found.
      **/
-    InvalidSlashRecord: GenericPalletError<Rv>;
+    InvalidSlashRecord: GenericPalletError;
 
     /**
      * Cannot bond, nominate or validate with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Era not yet started.
      **/
-    EraNotStarted: GenericPalletError<Rv>;
+    EraNotStarted: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Unapplied slashes in the recently concluded era is blocking this operation.
      * See `Call::apply_slash` to apply them.
      **/
-    UnappliedSlashesInPreviousEra: GenericPalletError<Rv>;
+    UnappliedSlashesInPreviousEra: GenericPalletError;
 
     /**
      * The era is not eligible for pruning.
      **/
-    EraNotPrunable: GenericPalletError<Rv>;
+    EraNotPrunable: GenericPalletError;
 
     /**
      * The slash has been cancelled and cannot be applied.
      **/
-    CancelledSlash: GenericPalletError<Rv>;
+    CancelledSlash: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -2981,63 +2981,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -3046,68 +3046,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -3116,77 +3116,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -3195,32 +3195,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -3229,68 +3229,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -3299,22 +3299,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -3323,22 +3323,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhOps`'s errors
@@ -3347,62 +3347,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Either no lease deposit or already unreserved.
      **/
-    NoLeaseReserve: GenericPalletError<Rv>;
+    NoLeaseReserve: GenericPalletError;
 
     /**
      * Either no crowdloan contribution or already withdrawn.
      **/
-    NoCrowdloanContribution: GenericPalletError<Rv>;
+    NoCrowdloanContribution: GenericPalletError;
 
     /**
      * Either no crowdloan reserve or already unreserved.
      **/
-    NoCrowdloanReserve: GenericPalletError<Rv>;
+    NoCrowdloanReserve: GenericPalletError;
 
     /**
      * Failed to withdraw crowdloan contribution.
      **/
-    FailedToWithdrawCrowdloanContribution: GenericPalletError<Rv>;
+    FailedToWithdrawCrowdloanContribution: GenericPalletError;
 
     /**
      * Block number is not yet reached.
      **/
-    NotYet: GenericPalletError<Rv>;
+    NotYet: GenericPalletError;
 
     /**
      * Not all contributions are withdrawn.
      **/
-    ContributionsRemaining: GenericPalletError<Rv>;
+    ContributionsRemaining: GenericPalletError;
 
     /**
      * The account is not a derived account.
      **/
-    WrongDerivedTranslation: GenericPalletError<Rv>;
+    WrongDerivedTranslation: GenericPalletError;
 
     /**
      * Account cannot be migrated since it is not a sovereign parachain account.
      **/
-    NotSovereign: GenericPalletError<Rv>;
+    NotSovereign: GenericPalletError;
 
     /**
      * Internal error, please bug report.
      **/
-    InternalError: GenericPalletError<Rv>;
+    InternalError: GenericPalletError;
 
     /**
      * The Asset Hub migration is not completed.
      **/
-    MigrationNotCompleted: GenericPalletError<Rv>;
+    MigrationNotCompleted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhMigrator`'s errors
@@ -3411,101 +3411,101 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to unreserve deposit.
      **/
-    FailedToUnreserveDeposit: GenericPalletError<Rv>;
+    FailedToUnreserveDeposit: GenericPalletError;
 
     /**
      * Failed to process an account data from RC.
      **/
-    FailedToProcessAccount: GenericPalletError<Rv>;
+    FailedToProcessAccount: GenericPalletError;
 
     /**
      * Some item could not be inserted because it already exists.
      **/
-    InsertConflict: GenericPalletError<Rv>;
+    InsertConflict: GenericPalletError;
 
     /**
      * Failed to convert RC type to AH type.
      **/
-    FailedToConvertType: GenericPalletError<Rv>;
+    FailedToConvertType: GenericPalletError;
 
     /**
      * Failed to fetch preimage.
      **/
-    PreimageNotFound: GenericPalletError<Rv>;
+    PreimageNotFound: GenericPalletError;
 
     /**
      * Failed to convert RC call to AH call.
      **/
-    FailedToConvertCall: GenericPalletError<Rv>;
+    FailedToConvertCall: GenericPalletError;
 
     /**
      * Failed to bound a call.
      **/
-    FailedToBoundCall: GenericPalletError<Rv>;
+    FailedToBoundCall: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to integrate a vesting schedule.
      **/
-    FailedToIntegrateVestingSchedule: GenericPalletError<Rv>;
+    FailedToIntegrateVestingSchedule: GenericPalletError;
 
     /**
      * Checking account overflow or underflow.
      **/
-    FailedToCalculateCheckingAccount: GenericPalletError<Rv>;
+    FailedToCalculateCheckingAccount: GenericPalletError;
 
     /**
      * Vector did not fit into its compile-time bound.
      **/
-    FailedToBoundVector: GenericPalletError<Rv>;
+    FailedToBoundVector: GenericPalletError;
 
     /**
      * The DMP queue priority is already set to the same value.
      **/
-    DmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    DmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * Preimage missing.
      **/
-    PreimageMissing: GenericPalletError<Rv>;
+    PreimageMissing: GenericPalletError;
 
     /**
      * Preimage too big.
      **/
-    PreimageTooBig: GenericPalletError<Rv>;
+    PreimageTooBig: GenericPalletError;
 
     /**
      * Preimage chunk missing.
      **/
-    PreimageChunkMissing: GenericPalletError<Rv>;
+    PreimageChunkMissing: GenericPalletError;
 
     /**
      * Preimage status invalid.
      **/
-    PreimageStatusInvalid: GenericPalletError<Rv>;
+    PreimageStatusInvalid: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/events.d.ts b/packages/chaintypes/src/kusama-asset-hub/events.d.ts
index 5d8c6f9f..5a81fe18 100644
--- a/packages/chaintypes/src/kusama-asset-hub/events.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -68,7 +68,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -76,18 +76,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -96,38 +90,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * A [`Task`] has started executing
      **/
-    TaskStarted: GenericPalletEvent<Rv, 'System', 'TaskStarted', { task: AssetHubKusamaRuntimeRuntimeTask }>;
+    TaskStarted: GenericPalletEvent<'System', 'TaskStarted', { task: AssetHubKusamaRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] has finished executing.
      **/
-    TaskCompleted: GenericPalletEvent<Rv, 'System', 'TaskCompleted', { task: AssetHubKusamaRuntimeRuntimeTask }>;
+    TaskCompleted: GenericPalletEvent<'System', 'TaskCompleted', { task: AssetHubKusamaRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] failed during execution.
      **/
     TaskFailed: GenericPalletEvent<
-      Rv,
       'System',
       'TaskFailed',
       { task: AssetHubKusamaRuntimeRuntimeTask; err: DispatchError }
@@ -136,13 +129,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -151,7 +143,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -160,13 +152,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -175,18 +166,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -196,7 +186,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -205,7 +194,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -217,7 +206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -236,20 +224,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -264,7 +251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -284,7 +270,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -306,7 +291,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -326,7 +310,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -340,7 +323,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -349,22 +332,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -373,18 +356,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -394,7 +376,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -404,7 +385,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -414,7 +394,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -424,7 +403,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -435,7 +413,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -445,7 +422,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -454,12 +430,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -471,7 +447,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -495,7 +470,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -504,40 +479,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -546,87 +520,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -637,7 +611,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -646,7 +619,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetTxPayment`'s events
@@ -657,7 +630,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who` in an asset `asset_id`.
      **/
     AssetTxFeePaid: GenericPalletEvent<
-      Rv,
       'AssetTxPayment',
       'AssetTxFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint; assetId: StagingXcmV5Location }
@@ -666,12 +638,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A swap of the refund in native currency back to asset failed.
      **/
-    AssetRefundFailed: GenericPalletEvent<Rv, 'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
+    AssetRefundFailed: GenericPalletEvent<'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -680,28 +652,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -711,7 +678,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -720,7 +686,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -730,7 +696,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -739,18 +704,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -759,13 +723,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -775,7 +738,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -784,13 +746,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -801,7 +762,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -810,7 +770,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -820,28 +780,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -850,12 +810,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -864,13 +824,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -885,7 +844,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -900,7 +858,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -912,7 +869,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -923,7 +879,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -934,7 +889,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -946,7 +900,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -963,7 +916,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -975,7 +927,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -987,7 +938,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -1003,7 +953,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1012,13 +961,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1030,7 +978,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1041,7 +988,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -1052,7 +998,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -1063,7 +1008,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -1079,7 +1023,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1091,7 +1034,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -1107,7 +1049,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1117,7 +1058,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1128,7 +1068,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1138,7 +1077,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -1148,7 +1086,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1157,14 +1094,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -1174,7 +1110,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -1184,7 +1119,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -1193,7 +1127,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -1203,29 +1137,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ToPolkadotXcmRouter`'s events
@@ -1235,7 +1164,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been decreased.
      **/
     DeliveryFeeFactorDecreased: GenericPalletEvent<
-      Rv,
       'ToPolkadotXcmRouter',
       'DeliveryFeeFactorDecreased',
       {
@@ -1250,7 +1178,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been increased.
      **/
     DeliveryFeeFactorIncreased: GenericPalletEvent<
-      Rv,
       'ToPolkadotXcmRouter',
       'DeliveryFeeFactorIncreased',
       {
@@ -1264,7 +1191,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -1274,7 +1201,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -1302,7 +1228,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1337,7 +1262,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1367,7 +1291,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1386,7 +1309,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1396,47 +1319,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1446,7 +1369,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1456,7 +1378,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1466,7 +1387,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1482,7 +1402,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1492,7 +1411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1501,7 +1419,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1510,14 +1428,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: AssetHubKusamaRuntimeProxyType; disambiguationIndex: number }
@@ -1527,7 +1444,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1541,13 +1457,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubKusamaRuntimeProxyType; delay: number }
@@ -1557,7 +1472,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubKusamaRuntimeProxyType; delay: number }
@@ -1567,7 +1481,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1576,7 +1489,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -1585,23 +1498,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -1610,7 +1522,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -1619,18 +1531,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -1639,13 +1550,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1654,33 +1564,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -1690,7 +1599,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -1699,23 +1607,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -1724,13 +1631,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -1740,7 +1646,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -1751,7 +1656,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -1760,13 +1664,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -1775,27 +1678,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -1804,33 +1707,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -1839,38 +1736,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: number; item: number }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: number; item: number }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: number; item: number }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: number; item: number }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: number }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: number }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: number }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1881,7 +1777,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1892,7 +1787,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1901,13 +1795,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: number }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: number; data: Bytes; isFrozen: boolean }
@@ -1916,13 +1809,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: number; item: number; data: Bytes; isFrozen: boolean }
@@ -1931,23 +1823,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: number; item: number }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: number; item: number }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: number; successfulItems: Array<number> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: number; maybeItem?: number | undefined; key: Bytes; value: Bytes }
@@ -1957,7 +1843,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes }
@@ -1967,7 +1852,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -1977,7 +1861,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -1987,7 +1870,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -1996,13 +1878,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2011,7 +1892,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nfts`'s events
@@ -2020,33 +1901,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Nfts', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Nfts', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Nfts', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Nfts',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -2055,23 +1930,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` became non-transferable.
      **/
-    ItemTransferLocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
+    ItemTransferLocked: GenericPalletEvent<'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
 
     /**
      * An `item` became transferable.
      **/
-    ItemTransferUnlocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
+    ItemTransferUnlocked: GenericPalletEvent<'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
 
     /**
      * `item` metadata or attributes were locked.
      **/
     ItemPropertiesLocked: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPropertiesLocked',
       { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean }
@@ -2080,18 +1954,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some `collection` was locked.
      **/
-    CollectionLocked: GenericPalletEvent<Rv, 'Nfts', 'CollectionLocked', { collection: number }>;
+    CollectionLocked: GenericPalletEvent<'Nfts', 'CollectionLocked', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TeamChanged',
       {
@@ -2107,7 +1980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     TransferApproved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TransferApproved',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32; deadline?: number | undefined }
@@ -2118,7 +1990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2128,7 +1999,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All approvals of an item got cancelled.
      **/
     AllApprovalsCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AllApprovalsCancelled',
       { collection: number; item: number; owner: AccountId32 }
@@ -2137,43 +2007,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its config changed by the `Force` origin.
      **/
-    CollectionConfigChanged: GenericPalletEvent<Rv, 'Nfts', 'CollectionConfigChanged', { collection: number }>;
+    CollectionConfigChanged: GenericPalletEvent<'Nfts', 'CollectionConfigChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
-    CollectionMetadataSet: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
+    CollectionMetadataSet: GenericPalletEvent<'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Nfts', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
-    ItemMetadataSet: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'ItemMetadataSet',
-      { collection: number; item: number; data: Bytes }
-    >;
+    ItemMetadataSet: GenericPalletEvent<'Nfts', 'ItemMetadataSet', { collection: number; item: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    ItemMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
+    ItemMetadataCleared: GenericPalletEvent<'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
 
     /**
      * The deposit for a set of `item`s within a `collection` has been updated.
      **/
-    Redeposited: GenericPalletEvent<Rv, 'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
+    Redeposited: GenericPalletEvent<'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeSet',
       {
@@ -2189,7 +2053,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes; namespace: PalletNftsAttributeNamespace }
@@ -2199,7 +2062,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was added.
      **/
     ItemAttributesApprovalAdded: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalAdded',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2209,7 +2071,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was removed.
      **/
     ItemAttributesApprovalRemoved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalRemoved',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2219,7 +2080,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2229,7 +2089,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2238,18 +2097,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Mint settings for a collection had changed.
      **/
-    CollectionMintSettingsUpdated: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'CollectionMintSettingsUpdated',
-      { collection: number }
-    >;
+    CollectionMintSettingsUpdated: GenericPalletEvent<'Nfts', 'CollectionMintSettingsUpdated', { collection: number }>;
 
     /**
      * Event gets emitted when the `NextCollectionId` gets incremented.
      **/
     NextCollectionIdIncremented: GenericPalletEvent<
-      Rv,
       'Nfts',
       'NextCollectionIdIncremented',
       { nextId?: number | undefined }
@@ -2259,7 +2112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the item.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2268,13 +2120,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the item was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2284,7 +2135,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A tip was sent.
      **/
     TipSent: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TipSent',
       { collection: number; item: number; sender: AccountId32; receiver: AccountId32; amount: bigint }
@@ -2294,7 +2144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An `item` swap intent was created.
      **/
     SwapCreated: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCreated',
       {
@@ -2311,7 +2160,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap was cancelled.
      **/
     SwapCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCancelled',
       {
@@ -2328,7 +2176,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap has been claimed.
      **/
     SwapClaimed: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapClaimed',
       {
@@ -2347,7 +2194,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New attributes have been set for an `item` of the `collection`.
      **/
     PreSignedAttributesSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PreSignedAttributesSet',
       { collection: number; item: number; namespace: PalletNftsAttributeNamespace }
@@ -2358,7 +2204,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * within that `collection`.
      **/
     PalletAttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PalletAttributeSet',
       { collection: number; item?: number | undefined; attribute: PalletNftsPalletAttributes; value: Bytes }
@@ -2367,7 +2212,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ForeignAssets`'s events
@@ -2377,7 +2222,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some asset class was created.
      **/
     Created: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Created',
       { assetId: StagingXcmV5Location; creator: AccountId32; owner: AccountId32 }
@@ -2387,7 +2231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were issued.
      **/
     Issued: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Issued',
       { assetId: StagingXcmV5Location; owner: AccountId32; amount: bigint }
@@ -2397,7 +2240,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Transferred',
       { assetId: StagingXcmV5Location; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2407,7 +2249,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were destroyed.
      **/
     Burned: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Burned',
       { assetId: StagingXcmV5Location; owner: AccountId32; balance: bigint }
@@ -2417,7 +2258,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TeamChanged',
       { assetId: StagingXcmV5Location; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2427,7 +2267,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The owner changed.
      **/
     OwnerChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'OwnerChanged',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2436,28 +2275,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
+    AssetFrozen: GenericPalletEvent<'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
+    AssetThawed: GenericPalletEvent<'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AccountsDestroyed',
       { assetId: StagingXcmV5Location; accountsDestroyed: number; accountsRemaining: number }
@@ -2467,7 +2305,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalsDestroyed',
       { assetId: StagingXcmV5Location; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2476,23 +2313,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'DestructionStarted',
-      { assetId: StagingXcmV5Location }
-    >;
+    DestructionStarted: GenericPalletEvent<'ForeignAssets', 'DestructionStarted', { assetId: StagingXcmV5Location }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
+    Destroyed: GenericPalletEvent<'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset class was force-created.
      **/
     ForceCreated: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ForceCreated',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2502,7 +2333,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'MetadataSet',
       { assetId: StagingXcmV5Location; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2511,13 +2341,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
+    MetadataCleared: GenericPalletEvent<'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovedTransfer',
       { assetId: StagingXcmV5Location; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2527,7 +2356,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalCancelled',
       { assetId: StagingXcmV5Location; owner: AccountId32; delegate: AccountId32 }
@@ -2538,7 +2366,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TransferredApproved',
       {
@@ -2553,18 +2380,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'AssetStatusChanged',
-      { assetId: StagingXcmV5Location }
-    >;
+    AssetStatusChanged: GenericPalletEvent<'ForeignAssets', 'AssetStatusChanged', { assetId: StagingXcmV5Location }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AssetMinBalanceChanged',
       { assetId: StagingXcmV5Location; newMinBalance: bigint }
@@ -2574,7 +2395,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some account `who` was created with a deposit from `depositor`.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Touched',
       { assetId: StagingXcmV5Location; who: AccountId32; depositor: AccountId32 }
@@ -2583,13 +2403,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Deposited',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2599,7 +2418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Withdrawn',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2608,7 +2426,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NftFractionalization`'s events
@@ -2618,7 +2436,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully fractionalized.
      **/
     NftFractionalized: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftFractionalized',
       { nftCollection: number; nft: number; fractions: bigint; asset: number; beneficiary: AccountId32 }
@@ -2628,7 +2445,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully returned back.
      **/
     NftUnified: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftUnified',
       { nftCollection: number; nft: number; asset: number; beneficiary: AccountId32 }
@@ -2637,7 +2453,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssets`'s events
@@ -2646,23 +2462,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Created',
-      { assetId: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'PoolAssets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2671,13 +2481,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2686,33 +2495,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'PoolAssets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'PoolAssets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'PoolAssets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'PoolAssets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2722,7 +2530,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2731,23 +2538,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'PoolAssets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'PoolAssets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'PoolAssets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'PoolAssets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2756,13 +2562,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'PoolAssets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'PoolAssets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2772,7 +2577,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2783,7 +2587,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2792,13 +2595,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2807,32 +2609,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Touched',
-      { assetId: number; who: AccountId32; depositor: AccountId32 }
-    >;
+    Touched: GenericPalletEvent<'PoolAssets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversion`'s events
@@ -2842,7 +2639,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `CreatePool` extrinsic will create this event.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'PoolCreated',
       {
@@ -2874,7 +2670,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `AddLiquidity` extrinsic will create this event.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityAdded',
       {
@@ -2919,7 +2714,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `RemoveLiquidity` extrinsic will create this event.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityRemoved',
       {
@@ -2970,7 +2764,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and `SwapTokenForExactToken` will generate this event.
      **/
     SwapExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapExecuted',
       {
@@ -3006,7 +2799,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Assets have been converted from one to another.
      **/
     SwapCreditExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapCreditExecuted',
       {
@@ -3032,7 +2824,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool has been touched in order to fulfill operational requirements.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'Touched',
       {
@@ -3051,7 +2842,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Recovery`'s events
@@ -3060,13 +2851,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been set up for an account.
      **/
-    RecoveryCreated: GenericPalletEvent<Rv, 'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
+    RecoveryCreated: GenericPalletEvent<'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
 
     /**
      * A recovery process has been initiated for lost account by rescuer account.
      **/
     RecoveryInitiated: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryInitiated',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -3076,7 +2866,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been vouched for by sender.
      **/
     RecoveryVouched: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryVouched',
       { lostAccount: AccountId32; rescuerAccount: AccountId32; sender: AccountId32 }
@@ -3086,7 +2875,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been closed.
      **/
     RecoveryClosed: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryClosed',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -3096,7 +2884,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Lost account has been successfully recovered by rescuer account.
      **/
     AccountRecovered: GenericPalletEvent<
-      Rv,
       'Recovery',
       'AccountRecovered',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -3105,13 +2892,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been removed for an account.
      **/
-    RecoveryRemoved: GenericPalletEvent<Rv, 'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
+    RecoveryRemoved: GenericPalletEvent<'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
 
     /**
      * A deposit has been updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Recovery',
       'DepositPoked',
       { who: AccountId32; kind: PalletRecoveryDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -3120,7 +2906,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Society`'s events
@@ -3129,51 +2915,45 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The society is founded by the given identity.
      **/
-    Founded: GenericPalletEvent<Rv, 'Society', 'Founded', { founder: AccountId32 }>;
+    Founded: GenericPalletEvent<'Society', 'Founded', { founder: AccountId32 }>;
 
     /**
      * A membership bid just happened. The given account is the candidate's ID and their offer
      * is the second.
      **/
-    Bid: GenericPalletEvent<Rv, 'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
+    Bid: GenericPalletEvent<'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
 
     /**
      * A membership bid just happened by vouching. The given account is the candidate's ID and
      * their offer is the second. The vouching party is the third.
      **/
-    Vouch: GenericPalletEvent<
-      Rv,
-      'Society',
-      'Vouch',
-      { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }
-    >;
+    Vouch: GenericPalletEvent<'Society', 'Vouch', { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }>;
 
     /**
      * A candidate was dropped (due to an excess of bids in the system).
      **/
-    AutoUnbid: GenericPalletEvent<Rv, 'Society', 'AutoUnbid', { candidate: AccountId32 }>;
+    AutoUnbid: GenericPalletEvent<'Society', 'AutoUnbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by their request).
      **/
-    Unbid: GenericPalletEvent<Rv, 'Society', 'Unbid', { candidate: AccountId32 }>;
+    Unbid: GenericPalletEvent<'Society', 'Unbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by request of who vouched for them).
      **/
-    Unvouch: GenericPalletEvent<Rv, 'Society', 'Unvouch', { candidate: AccountId32 }>;
+    Unvouch: GenericPalletEvent<'Society', 'Unvouch', { candidate: AccountId32 }>;
 
     /**
      * A group of candidates have been inducted. The batch's primary is the first value, the
      * batch in full is the second.
      **/
-    Inducted: GenericPalletEvent<Rv, 'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
+    Inducted: GenericPalletEvent<'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
 
     /**
      * A suspended member has been judged.
      **/
     SuspendedMemberJudgement: GenericPalletEvent<
-      Rv,
       'Society',
       'SuspendedMemberJudgement',
       { who: AccountId32; judged: boolean }
@@ -3182,53 +2962,52 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate has been suspended
      **/
-    CandidateSuspended: GenericPalletEvent<Rv, 'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
+    CandidateSuspended: GenericPalletEvent<'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
 
     /**
      * A member has been suspended
      **/
-    MemberSuspended: GenericPalletEvent<Rv, 'Society', 'MemberSuspended', { member: AccountId32 }>;
+    MemberSuspended: GenericPalletEvent<'Society', 'MemberSuspended', { member: AccountId32 }>;
 
     /**
      * A member has been challenged
      **/
-    Challenged: GenericPalletEvent<Rv, 'Society', 'Challenged', { member: AccountId32 }>;
+    Challenged: GenericPalletEvent<'Society', 'Challenged', { member: AccountId32 }>;
 
     /**
      * A vote has been placed
      **/
-    Vote: GenericPalletEvent<Rv, 'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
+    Vote: GenericPalletEvent<'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
 
     /**
      * A vote has been placed for a defending member
      **/
-    DefenderVote: GenericPalletEvent<Rv, 'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
+    DefenderVote: GenericPalletEvent<'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
 
     /**
      * A new set of \[params\] has been set for the group.
      **/
-    NewParams: GenericPalletEvent<Rv, 'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
+    NewParams: GenericPalletEvent<'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
 
     /**
      * Society is unfounded.
      **/
-    Unfounded: GenericPalletEvent<Rv, 'Society', 'Unfounded', { founder: AccountId32 }>;
+    Unfounded: GenericPalletEvent<'Society', 'Unfounded', { founder: AccountId32 }>;
 
     /**
      * Some funds were deposited into the society account.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Society', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Society', 'Deposit', { value: bigint }>;
 
     /**
      * A \[member\] got elevated to \[rank\].
      **/
-    Elevated: GenericPalletEvent<Rv, 'Society', 'Elevated', { member: AccountId32; rank: number }>;
+    Elevated: GenericPalletEvent<'Society', 'Elevated', { member: AccountId32; rank: number }>;
 
     /**
      * A deposit was poked / adjusted.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Society',
       'DepositPoked',
       { who: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -3237,7 +3016,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Revive`'s events
@@ -3247,7 +3026,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Revive',
       'ContractEmitted',
       {
@@ -3273,12 +3051,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by deployer at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
+    Instantiated: GenericPalletEvent<'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -3289,7 +3067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -3298,22 +3075,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -3322,13 +3099,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -3337,12 +3113,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -3358,7 +3129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -3373,7 +3143,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -3382,13 +3151,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -3402,7 +3170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -3413,7 +3180,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -3422,13 +3188,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -3438,7 +3203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -3448,7 +3212,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -3458,7 +3221,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -3468,7 +3230,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -3478,7 +3239,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -3488,7 +3248,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -3498,7 +3257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -3508,7 +3266,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -3517,19 +3274,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -3539,7 +3290,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -3549,7 +3299,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -3565,7 +3314,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -3574,17 +3323,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -3594,7 +3343,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3604,7 +3352,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3614,7 +3361,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3624,7 +3370,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3633,7 +3378,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingRcClient`'s events
@@ -3643,7 +3388,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A said session report was received.
      **/
     SessionReportReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'SessionReportReceived',
       {
@@ -3658,7 +3402,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new offence was reported.
      **/
     OffenceReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'OffenceReceived',
       { slashSession: number; offencesCount: number }
@@ -3668,12 +3411,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElection`'s events
@@ -3684,7 +3427,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * values.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'MultiBlockElection',
       'PhaseTransitioned',
       {
@@ -3703,22 +3445,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Target snapshot creation failed
      **/
-    UnexpectedTargetSnapshotFailed: GenericPalletEvent<
-      Rv,
-      'MultiBlockElection',
-      'UnexpectedTargetSnapshotFailed',
-      null
-    >;
+    UnexpectedTargetSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedTargetSnapshotFailed', null>;
 
     /**
      * Voter snapshot creation failed
      **/
-    UnexpectedVoterSnapshotFailed: GenericPalletEvent<Rv, 'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
+    UnexpectedVoterSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s events
@@ -3731,7 +3468,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was wrong, or the final checks of `finalize_verification` failed.
      **/
     VerificationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'VerificationFailed',
       [number, PalletElectionProviderMultiBlockVerifierFeasibilityError]
@@ -3741,13 +3477,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given page of a solution has been verified, with the given number of winners being
      * found in it.
      **/
-    Verified: GenericPalletEvent<Rv, 'MultiBlockElectionVerifier', 'Verified', [number, number]>;
+    Verified: GenericPalletEvent<'MultiBlockElectionVerifier', 'Verified', [number, number]>;
 
     /**
      * A solution with the given score has replaced our current best solution.
      **/
     Queued: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'Queued',
       [SpNposElectionsElectionScore, SpNposElectionsElectionScore | undefined]
@@ -3756,7 +3491,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s events
@@ -3766,7 +3501,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Upcoming submission has been registered for the given account, with the given score.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionSigned',
       'Registered',
       [number, AccountId32, SpNposElectionsElectionScore]
@@ -3775,37 +3509,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A page of solution solution with the given index has been stored for the given account.
      **/
-    Stored: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
+    Stored: GenericPalletEvent<'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
 
     /**
      * The given account has been rewarded with the given amount.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
+    Rewarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
 
     /**
      * The given account has been slashed with the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
+    Slashed: GenericPalletEvent<'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
 
     /**
      * The given solution, for the given round, was ejected.
      **/
-    Ejected: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
+    Ejected: GenericPalletEvent<'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
 
     /**
      * The given account has been discarded.
      **/
-    Discarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
+    Discarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
 
     /**
      * The given account has bailed.
      **/
-    Bailed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
+    Bailed: GenericPalletEvent<'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -3815,18 +3549,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingAsyncRewardDestination; amount: bigint }
@@ -3835,18 +3563,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -3854,40 +3577,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A subsequent event of `Withdrawn`, indicating that `stash` was fully removed from the
      * system.
      **/
-    StakerRemoved: GenericPalletEvent<Rv, 'Staking', 'StakerRemoved', { stash: AccountId32 }>;
+    StakerRemoved: GenericPalletEvent<'Staking', 'StakerRemoved', { stash: AccountId32 }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -3897,7 +3619,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingAsyncValidatorPrefs }
@@ -3906,29 +3627,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * A page from a multi-page election was fetched. A number of these are followed by
@@ -3942,7 +3658,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the overall election will continue.
      **/
     PagedElectionProceeded: GenericPalletEvent<
-      Rv,
       'Staking',
       'PagedElectionProceeded',
       { page: number; result: Result<number, number> }
@@ -3953,7 +3668,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * given era as been reported.
      **/
     OffenceReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceReported',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -3963,7 +3677,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An offence has been processed and the corresponding slash has been computed.
      **/
     SlashComputed: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashComputed',
       { offenceEra: number; slashEra: number; offender: AccountId32; page: number }
@@ -3972,7 +3685,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unapplied slash has been cancelled.
      **/
-    SlashCancelled: GenericPalletEvent<Rv, 'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
+    SlashCancelled: GenericPalletEvent<'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
 
     /**
      * Session change has been triggered.
@@ -3981,7 +3694,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * election is ongoing.
      **/
     SessionRotated: GenericPalletEvent<
-      Rv,
       'Staking',
       'SessionRotated',
       { startingSession: number; activeEra: number; plannedEra: number }
@@ -3991,13 +3703,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
 
     /**
      * An offence was reported that was too old to be processed, and thus was dropped.
      **/
     OffenceTooOld: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceTooOld',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -4006,12 +3717,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An old era with the given index was pruned.
      **/
-    EraPruned: GenericPalletEvent<Rv, 'Staking', 'EraPruned', { index: number }>;
+    EraPruned: GenericPalletEvent<'Staking', 'EraPruned', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -4020,38 +3731,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -4060,18 +3765,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -4087,28 +3786,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -4117,18 +3816,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -4138,7 +3836,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -4147,12 +3844,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -4162,7 +3859,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -4187,7 +3883,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -4212,7 +3907,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -4237,7 +3931,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -4257,7 +3950,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -4283,7 +3975,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -4294,7 +3985,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -4309,7 +3999,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -4329,7 +4018,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -4344,7 +4032,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -4364,7 +4051,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -4384,7 +4070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -4404,7 +4089,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -4424,7 +4108,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -4449,7 +4132,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -4469,7 +4151,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -4488,16 +4169,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -4506,7 +4186,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -4515,28 +4195,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -4545,38 +4224,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -4585,7 +4263,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -4594,13 +4272,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -4610,7 +4287,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -4619,31 +4295,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -4652,7 +4325,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhOps`'s events
@@ -4662,7 +4335,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some lease reserve could not be unreserved and needs manual cleanup.
      **/
     LeaseUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'LeaseUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4672,7 +4344,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some amount for a crowdloan reserve could not be unreserved and needs manual cleanup.
      **/
     CrowdloanUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'CrowdloanUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4683,7 +4354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * representation.
      **/
     SovereignMigrated: GenericPalletEvent<
-      Rv,
       'AhOps',
       'SovereignMigrated',
       {
@@ -4712,7 +4382,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhMigrator`'s events
@@ -4722,7 +4392,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'StageTransition',
       {
@@ -4742,7 +4411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We received a batch of messages that will be integrated into a pallet.
      **/
     BatchReceived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchReceived',
       { pallet: PalletAhMigratorPalletEventName; count: number }
@@ -4752,7 +4420,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We processed a batch of messages for this pallet.
      **/
     BatchProcessed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchProcessed',
       { pallet: PalletAhMigratorPalletEventName; countGood: number; countBad: number }
@@ -4766,7 +4433,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * easier to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -4775,13 +4442,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * Whether the DMP queue was prioritized for the next block.
      **/
     DmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePrioritySet',
       {
@@ -4808,7 +4474,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The DMP queue priority config was set.
      **/
     DmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePriorityConfigSet',
       {
@@ -4828,7 +4493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were recorded.
      **/
     BalancesBeforeRecordSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordSet',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4838,7 +4502,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were consumed.
      **/
     BalancesBeforeRecordConsumed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordConsumed',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4847,13 +4510,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A referendum was cancelled because it could not be mapped.
      **/
-    ReferendumCanceled: GenericPalletEvent<Rv, 'AhMigrator', 'ReferendumCanceled', { id: number }>;
+    ReferendumCanceled: GenericPalletEvent<'AhMigrator', 'ReferendumCanceled', { id: number }>;
 
     /**
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'ManagerSet',
       {
@@ -4869,13 +4531,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     AccountTranslatedParachainSovereign: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereign',
       { from: AccountId32; to: AccountId32 }
     >;
     AccountTranslatedParachainSovereignDerived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereignDerived',
       { from: AccountId32; to: AccountId32; derivationIndex: number }
@@ -4885,7 +4545,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'XcmSent',
       {
@@ -4900,7 +4559,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Failed to unreserve a multisig deposit.
      **/
     FailedToUnreserveMultisigDeposit: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'FailedToUnreserveMultisigDeposit',
       {
@@ -4925,7 +4583,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Failed to unreserve a legacy status preimage deposit.
      **/
     FailedToUnreservePreimageDeposit: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'FailedToUnreservePreimageDeposit',
       {
@@ -4949,6 +4606,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/index.d.ts b/packages/chaintypes/src/kusama-asset-hub/index.d.ts
index aa981d0f..5f5c21a9 100644
--- a/packages/chaintypes/src/kusama-asset-hub/index.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AssetHubKusamaRuntimeRuntimeCall,
@@ -14,6 +14,7 @@ import type {
   FrameSystemExtensionsCheckWeight,
   PalletAssetConversionTxPaymentChargeAssetTxPayment,
   FrameMetadataHashExtensionCheckMetadataHash,
+  StagingXcmV5Location,
 } from './types.js';
 import { ChainConsts } from './consts.js';
 import { ChainStorage } from './query.js';
@@ -41,26 +42,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletAssetConversionTxPaymentChargeAssetTxPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedKusamaAssetHubApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: StagingXcmV5Location;
 }
 
 /**
  * @name: KusamaAssetHubApi
  * @specVersion: 2000002
  **/
-export interface KusamaAssetHubApi {
-  legacy: VersionedKusamaAssetHubApi<RpcLegacy>;
-  v2: VersionedKusamaAssetHubApi<RpcV2>;
+export interface KusamaAssetHubApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/json-rpc.d.ts b/packages/chaintypes/src/kusama-asset-hub/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/kusama-asset-hub/json-rpc.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/kusama-asset-hub/query.d.ts b/packages/chaintypes/src/kusama-asset-hub/query.d.ts
index 69ff60d3..0cdd7121 100644
--- a/packages/chaintypes/src/kusama-asset-hub/query.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -155,7 +155,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -166,35 +166,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -202,7 +202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -210,28 +210,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -244,14 +244,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -268,21 +268,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -290,21 +290,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -317,12 +317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -338,7 +338,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -348,7 +348,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -362,7 +361,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -373,7 +372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -382,14 +381,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -398,7 +397,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -411,7 +410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -422,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -434,7 +433,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -448,7 +447,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -462,7 +460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -472,7 +470,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -483,7 +481,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -494,7 +491,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -504,7 +501,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -513,7 +509,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -523,7 +519,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -534,7 +529,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -543,21 +538,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -565,7 +560,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -573,7 +568,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -581,7 +576,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -590,12 +585,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -606,7 +601,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -616,12 +611,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -631,12 +626,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -649,7 +644,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -660,12 +655,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -679,7 +674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -687,19 +682,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -710,7 +705,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -718,7 +713,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -726,11 +721,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -741,12 +732,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -759,7 +750,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubKusamaRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: AssetHubKusamaRuntimeRuntimeParametersKey) => AssetHubKusamaRuntimeRuntimeParametersValue | undefined,
       AssetHubKusamaRuntimeRuntimeParametersKey
     >;
@@ -767,7 +757,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -778,14 +768,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -816,7 +806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -827,7 +817,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -837,7 +827,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -846,7 +836,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>> =} callback
      **/
     holds: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>,
       AccountId32
     >;
@@ -858,7 +847,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -866,7 +854,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -876,18 +864,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -899,11 +887,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -912,12 +896,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -928,13 +912,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -945,11 +929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -958,7 +938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -969,12 +948,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -985,12 +964,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -1001,7 +980,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -1012,7 +991,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -1020,7 +999,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -1029,7 +1008,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -1038,12 +1017,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1054,14 +1033,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1069,7 +1048,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1077,7 +1056,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1088,7 +1067,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1096,11 +1075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AssetHubKusamaRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => AssetHubKusamaRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AssetHubKusamaRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1109,7 +1084,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1117,7 +1091,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1128,7 +1102,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1137,12 +1111,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1157,7 +1131,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -1167,12 +1141,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1190,7 +1164,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1202,7 +1176,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1211,7 +1185,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1223,7 +1196,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1233,14 +1205,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1249,7 +1221,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1257,7 +1228,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1268,7 +1239,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1276,7 +1247,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1287,7 +1258,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1295,7 +1266,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1304,7 +1275,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1316,7 +1286,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1329,7 +1298,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1341,14 +1309,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1357,7 +1325,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1369,7 +1336,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1379,7 +1345,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1392,7 +1358,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1404,7 +1370,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1415,7 +1381,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1423,7 +1388,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ToPolkadotXcmRouter`'s storage queries
@@ -1440,12 +1405,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
+    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1458,7 +1423,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1468,7 +1432,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1477,7 +1441,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1485,7 +1448,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1498,7 +1461,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1506,7 +1468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1520,7 +1482,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Array<PalletProxyProxyDefinitionProxyType>, bigint]> =} callback
      **/
     proxies: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [Array<PalletProxyProxyDefinitionProxyType>, bigint],
       AccountId32
     >;
@@ -1531,16 +1492,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RemoteProxyRelayChain`'s storage queries
@@ -1552,12 +1509,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, H256]>> =} callback
      **/
-    blockToRoot: GenericStorageQuery<Rv, () => Array<[number, H256]>>;
+    blockToRoot: GenericStorageQuery<() => Array<[number, H256]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -1569,12 +1526,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1586,7 +1543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1595,7 +1552,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1609,7 +1565,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1620,7 +1575,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1635,12 +1590,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1652,7 +1607,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1660,7 +1615,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1670,7 +1625,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1682,7 +1636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1690,7 +1644,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1698,7 +1652,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1707,7 +1661,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -1719,7 +1672,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -1731,7 +1683,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1742,12 +1693,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1759,7 +1710,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1767,7 +1718,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1777,7 +1728,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1789,11 +1739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1803,7 +1749,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -1814,7 +1759,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1822,7 +1767,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1831,7 +1776,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -1843,7 +1787,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -1857,7 +1800,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1868,7 +1810,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1876,7 +1818,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1884,11 +1826,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -1896,7 +1834,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1904,16 +1842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1926,7 +1860,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
     asset: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletAssetsAssetDetails | undefined,
       StagingXcmV5Location
     >;
@@ -1938,7 +1871,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -1952,7 +1884,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [StagingXcmV5Location, AccountId32, AccountId32]
     >;
@@ -1963,7 +1894,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {StagingXcmV5Location} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
+    metadata: GenericStorageQuery<(arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1978,12 +1909,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => StagingXcmV5Location | undefined>;
+    nextAssetId: GenericStorageQuery<() => StagingXcmV5Location | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NftFractionalization`'s storage queries
@@ -1996,7 +1927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
      **/
     nftToAsset: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftFractionalizationDetails | undefined,
       [number, number]
     >;
@@ -2004,7 +1934,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -2016,7 +1946,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2025,7 +1955,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2039,7 +1968,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2050,7 +1978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2065,12 +1993,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -2084,7 +2012,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, StagingXcmV5Location]) => PalletAssetConversionPoolInfo | undefined,
       [StagingXcmV5Location, StagingXcmV5Location]
     >;
@@ -2095,12 +2022,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -2112,11 +2039,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
-      AccountId32
-    >;
+    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
 
     /**
      * Active recovery attempts.
@@ -2128,7 +2051,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2141,12 +2063,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Society`'s storage queries
@@ -2157,28 +2079,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
      **/
-    parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
+    parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
 
     /**
      * Amount of our account balance that is specifically for the next round's bid(s).
      *
      * @param {Callback<bigint> =} callback
      **/
-    pot: GenericStorageQuery<Rv, () => bigint>;
+    pot: GenericStorageQuery<() => bigint>;
 
     /**
      * The first member.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    founder: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The most primary from the most recently approved rank 0 members in the society.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    head: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * A hash of the rules of this society concerning membership. Can only be set once and
@@ -2186,7 +2108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    rules: GenericStorageQuery<Rv, () => H256 | undefined>;
+    rules: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * The current members and their rank. Doesn't include `SuspendedMembers`.
@@ -2194,7 +2116,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * Information regarding rank-0 payouts, past and future.
@@ -2202,14 +2124,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyPayoutRecord> =} callback
      **/
-    payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
+    payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
 
     /**
      * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
      *
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, () => number>;
+    memberCount: GenericStorageQuery<() => number>;
 
     /**
      * The current items in `Members` keyed by their unique index. Keys are densely populated
@@ -2218,7 +2140,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The set of suspended members, with their old membership record.
@@ -2226,39 +2148,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    suspendedMembers: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined,
-      AccountId32
-    >;
+    suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * The number of rounds which have passed.
      *
      * @param {Callback<number> =} callback
      **/
-    roundCount: GenericStorageQuery<Rv, () => number>;
+    roundCount: GenericStorageQuery<() => number>;
 
     /**
      * The current bids, stored ordered by the value of the bid.
      *
      * @param {Callback<Array<PalletSocietyBid>> =} callback
      **/
-    bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
+    bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
+    candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
 
     /**
      * The current skeptic.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Double map from Candidate -> Voter -> (Maybe) Vote.
@@ -2267,7 +2185,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     votes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2278,7 +2195,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * At the end of the claim period, this contains the most recently approved members (along with
@@ -2287,21 +2204,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
      **/
-    nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
+    nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
 
     /**
      * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
      *
      * @param {Callback<number> =} callback
      **/
-    challengeRoundCount: GenericStorageQuery<Rv, () => number>;
+    challengeRoundCount: GenericStorageQuery<() => number>;
 
     /**
      * The defending member currently being challenged, along with a running tally of votes.
      *
      * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
      **/
-    defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+    defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
 
     /**
      * Votes for the defender, keyed by challenge round.
@@ -2310,7 +2227,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     defenderVotes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined,
       [number, AccountId32]
     >;
@@ -2320,19 +2236,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextIntakeAt: GenericStorageQuery<Rv, () => number | undefined>;
+    nextIntakeAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Next challenge rotation scheduled with [Config::BlockNumberProvider].
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextChallengeAt: GenericStorageQuery<Rv, () => number | undefined>;
+    nextChallengeAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -2344,7 +2260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -2352,7 +2268,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveVmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
 
     /**
      * The data associated to a contract or externally owned account.
@@ -2360,7 +2276,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageAccountInfo | undefined> =} callback
      **/
-    accountInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
+    accountInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -2368,7 +2284,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -2379,7 +2295,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -2387,7 +2303,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -2400,12 +2316,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2419,7 +2335,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -2428,7 +2344,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -2437,12 +2353,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2457,14 +2373,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2477,7 +2393,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2485,7 +2401,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2493,7 +2409,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2501,7 +2417,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2510,7 +2426,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2521,7 +2437,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2531,7 +2446,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2539,14 +2454,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2555,14 +2470,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2571,14 +2486,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2586,21 +2501,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2611,14 +2526,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2626,16 +2541,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2649,14 +2560,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2666,7 +2577,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2674,7 +2585,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2684,12 +2595,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2705,7 +2616,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2715,7 +2625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2723,23 +2633,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRcClient`'s storage queries
@@ -2750,7 +2656,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncRcClientSessionReport | undefined> =} callback
      **/
-    incompleteSessionReport: GenericStorageQuery<Rv, () => PalletStakingAsyncRcClientSessionReport | undefined>;
+    incompleteSessionReport: GenericStorageQuery<() => PalletStakingAsyncRcClientSessionReport | undefined>;
 
     /**
      * The last session report's `end_index` that we have acted upon.
@@ -2764,7 +2670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSessionReportEndingIndex: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSessionReportEndingIndex: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A validator set that is outgoing, and should be sent.
@@ -2774,15 +2680,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientValidatorSetReport, number] | undefined> =} callback
      **/
-    outgoingValidatorSet: GenericStorageQuery<
-      Rv,
-      () => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined
-    >;
+    outgoingValidatorSet: GenericStorageQuery<() => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElection`'s storage queries
@@ -2798,14 +2701,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiBlockPhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockPhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiBlockPhase>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -2813,7 +2716,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    desiredTargets: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Paginated voter snapshot. At most [`T::Pages`] keys will exist.
@@ -2822,7 +2725,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint, Array<AccountId32>]> | undefined> =} callback
      **/
     pagedVoterSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<[AccountId32, bigint, Array<AccountId32>]> | undefined,
       [number, number]
     >;
@@ -2835,7 +2737,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedVoterSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedVoterSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Paginated target snapshot.
@@ -2846,7 +2748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
     pagedTargetSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<AccountId32> | undefined,
       [number, number]
     >;
@@ -2859,12 +2760,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedTargetSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedTargetSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s storage queries
@@ -2883,7 +2784,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionX: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2895,7 +2795,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionY: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2908,7 +2807,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsValidSolution> =} callback
      **/
     queuedValidVariant: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiBlockVerifierImplsValidSolution,
       number
     >;
@@ -2927,7 +2825,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined> =} callback
      **/
     queuedSolutionBackings: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number],
       ) => Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined,
@@ -2942,26 +2839,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    queuedSolutionScore: GenericStorageQuery<Rv, (arg: number) => SpNposElectionsElectionScore | undefined, number>;
+    queuedSolutionScore: GenericStorageQuery<(arg: number) => SpNposElectionsElectionScore | undefined, number>;
 
     /**
      * The minimum score that each solution must attain in order to be considered feasible.
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Storage item for [`Status`].
      *
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsStatus> =} callback
      **/
-    statusStorage: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockVerifierImplsStatus>;
+    statusStorage: GenericStorageQuery<() => PalletElectionProviderMultiBlockVerifierImplsStatus>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s storage queries
@@ -2980,14 +2877,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, SpNposElectionsElectionScore]>> =} callback
      **/
-    sortedScores: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
+    sortedScores: GenericStorageQuery<(arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
 
     /**
      * Triple map from (round, account, page) to a solution page.
@@ -2996,7 +2893,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubKusamaRuntimeStakingNposCompactSolution24 | undefined> =} callback
      **/
     submissionStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => AssetHubKusamaRuntimeStakingNposCompactSolution24 | undefined,
       [number, AccountId32, number]
     >;
@@ -3011,7 +2907,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined> =} callback
      **/
     submissionMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3019,7 +2914,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -3030,7 +2925,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -3039,7 +2934,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -3049,28 +2944,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -3079,7 +2974,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -3091,7 +2986,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncLedgerStakingLedger | undefined> =} callback
      **/
     ledger: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingAsyncLedgerStakingLedger | undefined,
       AccountId32
     >;
@@ -3104,11 +2998,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined,
-      AccountId32
-    >;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -3118,14 +3008,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -3134,7 +3024,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -3160,18 +3050,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncNominations | undefined,
-      AccountId32
-    >;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -3184,14 +3070,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -3200,7 +3086,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current planned era index.
@@ -3210,7 +3096,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -3220,7 +3106,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingAsyncActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingAsyncActiveEraInfo | undefined>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -3230,7 +3116,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -3250,7 +3136,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3267,7 +3152,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncPalletBoundedExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => PalletStakingAsyncPalletBoundedExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -3283,7 +3167,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Exposure of validator at era with the preferences of validators.
@@ -3296,7 +3180,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncValidatorPrefs,
       [number, AccountId32]
     >;
@@ -3309,7 +3192,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -3318,7 +3201,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingAsyncEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -3327,14 +3210,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingAsyncForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingAsyncForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingAsyncForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -3343,7 +3226,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -3352,7 +3235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -3360,7 +3243,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * Stores reported offences in a queue until they are processed in subsequent blocks.
@@ -3378,7 +3261,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncSlashingOffenceRecord | undefined> =} callback
      **/
     offenceQueue: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncSlashingOffenceRecord | undefined,
       [number, AccountId32]
     >;
@@ -3398,7 +3280,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    offenceQueueEras: GenericStorageQuery<Rv, () => Array<number> | undefined>;
+    offenceQueueEras: GenericStorageQuery<() => Array<number> | undefined>;
 
     /**
      * Tracks the currently processed offence record from the `OffenceQueue`.
@@ -3417,7 +3299,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined> =} callback
      **/
     processingOffence: GenericStorageQuery<
-      Rv,
       () => [number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined
     >;
 
@@ -3428,7 +3309,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncUnappliedSlash | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, [AccountId32Like, Perbill, number]]) => PalletStakingAsyncUnappliedSlash | undefined,
       [number, [AccountId32, Perbill, number]]
     >;
@@ -3443,7 +3323,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, Perbill]>> =} callback
      **/
-    cancelledSlashes: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, Perbill]>, number>;
+    cancelledSlashes: GenericStorageQuery<(arg: number) => Array<[AccountId32, Perbill]>, number>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -3453,7 +3333,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -3465,7 +3344,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Voter snapshot progress status.
@@ -3475,7 +3354,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncSnapshotStatus> =} callback
      **/
-    voterSnapshotStatus: GenericStorageQuery<Rv, () => PalletStakingAsyncSnapshotStatus>;
+    voterSnapshotStatus: GenericStorageQuery<() => PalletStakingAsyncSnapshotStatus>;
 
     /**
      * Keeps track of an ongoing multi-page election solution request.
@@ -3487,14 +3366,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextElectionPage: GenericStorageQuery<Rv, () => number | undefined>;
+    nextElectionPage: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A bounded list of the "electable" stashes that resulted from a successful election.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    electableStashes: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    electableStashes: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Tracks the current step of era pruning process for each era being lazily pruned.
@@ -3502,12 +3381,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncPalletPruningStep | undefined> =} callback
      **/
-    eraPruningState: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
+    eraPruningState: GenericStorageQuery<(arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -3521,7 +3400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -3532,14 +3411,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -3549,14 +3428,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -3564,19 +3443,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -3590,7 +3469,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -3603,12 +3481,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -3619,7 +3497,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3628,7 +3506,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferendaReferendumInfoOriginCaller | undefined> =} callback
      **/
     referendumInfoFor: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletReferendaReferendumInfoOriginCaller | undefined,
       number
     >;
@@ -3642,7 +3519,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3650,7 +3527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -3663,12 +3540,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -3679,12 +3556,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -3695,7 +3572,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -3703,7 +3580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -3711,19 +3588,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -3735,7 +3612,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -3744,7 +3621,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -3752,7 +3629,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -3761,7 +3638,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -3774,7 +3650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -3786,7 +3662,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -3794,12 +3670,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3814,7 +3690,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3822,7 +3697,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhOps`'s storage queries
@@ -3848,7 +3723,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcLeaseReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3871,7 +3745,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, bigint] | undefined> =} callback
      **/
     rcCrowdloanContribution: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => [AccountId32, bigint] | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3891,7 +3764,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcCrowdloanReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3899,7 +3771,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhMigrator`'s storage queries
@@ -3913,18 +3785,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRcMigratorAccountsAccount | undefined> =} callback
      **/
-    rcAccounts: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined,
-      AccountId32
-    >;
+    rcAccounts: GenericStorageQuery<(arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined, AccountId32>;
 
     /**
      * The Asset Hub migration state.
      *
      * @param {Callback<PalletAhMigratorMigrationStage> =} callback
      **/
-    ahMigrationStage: GenericStorageQuery<Rv, () => PalletAhMigratorMigrationStage>;
+    ahMigrationStage: GenericStorageQuery<() => PalletAhMigratorMigrationStage>;
 
     /**
      * Helper storage item to store the total balance / total issuance of native token at the start
@@ -3933,7 +3801,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAhMigratorBalancesBefore> =} callback
      **/
-    ahBalancesBefore: GenericStorageQuery<Rv, () => PalletAhMigratorBalancesBefore>;
+    ahBalancesBefore: GenericStorageQuery<() => PalletAhMigratorBalancesBefore>;
 
     /**
      * The priority of the DMP queue during migration.
@@ -3945,7 +3813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    dmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    dmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -3955,7 +3823,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -3965,7 +3833,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -3975,11 +3843,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/runtime.d.ts b/packages/chaintypes/src/kusama-asset-hub/runtime.d.ts
index 6bde1976..20904e2a 100644
--- a/packages/chaintypes/src/kusama-asset-hub/runtime.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -67,7 +67,7 @@ import type {
   PalletReviveEvmApiDebugRpcTypesTracerType,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -79,19 +79,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -102,12 +102,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -129,12 +129,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -145,7 +145,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -153,7 +153,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -161,12 +161,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -177,7 +177,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -188,7 +188,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -197,12 +197,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -218,7 +218,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -229,7 +228,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -238,7 +237,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -250,14 +248,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -280,7 +277,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -293,7 +289,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -305,12 +301,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -328,7 +324,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -339,14 +335,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -360,7 +355,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -370,7 +364,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -382,12 +376,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetConversionApi - 0x8a8047a53a8277ec
@@ -406,7 +400,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceTokensForExactTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -428,7 +421,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceExactTokensForTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -445,14 +437,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {StagingXcmV5Location} asset2
      **/
     getReserves: GenericRuntimeApiMethod<
-      Rv,
       (asset1: StagingXcmV5Location, asset2: StagingXcmV5Location) => Promise<[bigint, bigint] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -465,7 +456,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -476,7 +466,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -485,19 +474,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -511,7 +500,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -523,7 +511,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -533,7 +520,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -541,12 +528,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -563,7 +550,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -578,7 +564,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -595,7 +580,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -614,7 +598,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -624,7 +607,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -639,7 +622,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AssetHubKusamaRuntimeOriginCaller,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
@@ -655,7 +637,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -665,7 +646,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -678,14 +659,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -703,7 +683,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -722,7 +701,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -732,7 +710,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -745,7 +723,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -759,7 +736,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -769,7 +745,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: FungiblesApi - 0xde92b8a0426b9bf6
@@ -782,14 +758,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} account
      **/
     queryAccountBalances: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like) => Promise<Result<XcmVersionedAssets, AssetsCommonRuntimeApiFungiblesAccessError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -804,12 +779,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -830,7 +805,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -851,7 +826,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -861,12 +836,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -877,12 +852,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -894,7 +869,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -903,7 +878,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -912,7 +887,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -920,7 +895,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -931,7 +906,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -946,7 +921,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -960,7 +935,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -968,7 +943,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -976,7 +951,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -984,12 +959,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -1001,7 +976,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -1010,7 +985,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -1019,12 +994,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Inflation - 0xc51ff1fa3f5d0cca
@@ -1038,15 +1013,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Inflation_experimental_issuance_prediction_info
      **/
-    experimentalIssuancePredictionInfo: GenericRuntimeApiMethod<
-      Rv,
-      () => Promise<SystemParachainsCommonApisInflationInfo>
-    >;
+    experimentalIssuancePredictionInfo: GenericRuntimeApiMethod<() => Promise<SystemParachainsCommonApisInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ReviveApi - 0x8c403e5c4a9fd442
@@ -1057,7 +1029,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_gas_limit
      **/
-    blockGasLimit: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    blockGasLimit: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the free balance of the given `[H160]` address, using EVM decimals.
@@ -1065,14 +1037,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_balance
      * @param {H160} address
      **/
-    balance: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<U256>>;
+    balance: GenericRuntimeApiMethod<(address: H160) => Promise<U256>>;
 
     /**
      * Returns the gas price.
      *
      * @callname: ReviveApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the nonce of the given `[H160]` address.
@@ -1080,7 +1052,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_nonce
      * @param {H160} address
      **/
-    nonce: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number>>;
+    nonce: GenericRuntimeApiMethod<(address: H160) => Promise<number>>;
 
     /**
      * Perform a call from a specified account to a given contract.
@@ -1096,7 +1068,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: H160,
@@ -1122,7 +1093,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -1143,7 +1113,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiRpcTypesGenGenericTransaction} tx
      **/
     ethTransact: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
       ) => Promise<Result<PalletRevivePrimitivesEthTransactInfo, PalletRevivePrimitivesEthTransactError>>
@@ -1160,7 +1129,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} storage_deposit_limit
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -1180,7 +1148,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32>} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: H160,
         key: FixedBytes<32>,
@@ -1199,7 +1166,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorageVarKey: GenericRuntimeApiMethod<
-      Rv,
       (address: H160, key: BytesLike) => Promise<Result<Bytes | undefined, PalletRevivePrimitivesContractAccessError>>
     >;
 
@@ -1216,7 +1182,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1237,7 +1202,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceTx: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         txIndex: number,
@@ -1255,7 +1219,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceCall: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1267,7 +1230,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_author
      **/
-    blockAuthor: GenericRuntimeApiMethod<Rv, () => Promise<H160 | undefined>>;
+    blockAuthor: GenericRuntimeApiMethod<() => Promise<H160 | undefined>>;
 
     /**
      * Get the H160 address associated to this account id
@@ -1275,14 +1238,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_address
      * @param {AccountId32Like} account_id
      **/
-    address: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<H160>>;
+    address: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<H160>>;
 
     /**
      * The address used to call the runtime's pallets dispatchables
      *
      * @callname: ReviveApi_runtime_pallets_address
      **/
-    runtimePalletsAddress: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    runtimePalletsAddress: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * The code at the specified address taking pre-compiles into account.
@@ -1290,11 +1253,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_code
      * @param {H160} address
      **/
-    code: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    code: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/tx.d.ts b/packages/chaintypes/src/kusama-asset-hub/tx.d.ts
index 68429756..edcceaf0 100644
--- a/packages/chaintypes/src/kusama-asset-hub/tx.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -128,16 +126,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AssetHubKusamaRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AssetHubKusamaRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -150,16 +150,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -169,16 +168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -188,16 +186,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -210,16 +207,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -229,16 +225,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -248,16 +243,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -271,19 +265,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -293,16 +286,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -311,16 +303,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeTask} task
      **/
     doTask: GenericTxCall<
-      Rv,
       (task: AssetHubKusamaRuntimeRuntimeTask) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'DoTask';
             params: { task: AssetHubKusamaRuntimeRuntimeTask };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -333,16 +324,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -359,16 +349,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -386,23 +375,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -423,12 +411,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -438,7 +424,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -447,23 +434,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -493,23 +479,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -518,7 +503,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -534,16 +519,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -560,20 +544,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -585,15 +568,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -607,23 +589,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -638,16 +619,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -662,16 +642,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -684,16 +663,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -705,16 +683,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -726,23 +703,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -757,14 +733,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -776,7 +750,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -787,19 +762,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -813,7 +787,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -821,7 +794,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -834,7 +806,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -844,16 +817,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -866,14 +838,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -885,7 +855,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -899,7 +870,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -907,7 +877,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -920,7 +889,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -943,20 +913,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -979,20 +948,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1002,16 +970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1021,23 +988,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -1052,23 +1018,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: AssetHubKusamaRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: AssetHubKusamaRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -1087,19 +1052,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1112,20 +1076,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1141,19 +1104,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1178,19 +1140,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1203,19 +1164,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1232,16 +1192,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1254,19 +1213,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1281,19 +1239,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1310,26 +1267,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1348,15 +1304,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1376,16 +1331,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1408,19 +1362,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1445,20 +1398,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1489,19 +1441,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1517,26 +1468,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -1572,19 +1522,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1611,14 +1560,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1630,7 +1577,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1668,13 +1616,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1685,7 +1631,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1713,16 +1660,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1733,27 +1679,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -1777,16 +1722,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1800,16 +1744,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1825,16 +1768,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1846,15 +1788,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1867,15 +1808,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1888,16 +1828,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1910,16 +1849,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1935,16 +1873,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1961,26 +1898,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2001,19 +1937,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: AssetHubKusamaRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: AssetHubKusamaRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2033,22 +1968,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -2061,15 +1995,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2082,15 +2015,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2104,16 +2036,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2127,16 +2058,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2150,23 +2080,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -2178,19 +2107,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2222,14 +2150,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2241,7 +2167,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2285,14 +2212,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2304,7 +2229,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2322,19 +2248,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2350,19 +2275,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2376,16 +2300,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2398,16 +2321,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2422,16 +2344,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2474,7 +2395,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2482,7 +2402,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2495,7 +2414,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2526,7 +2446,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2534,7 +2453,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2547,7 +2465,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2560,16 +2479,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2615,7 +2533,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2623,7 +2540,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2636,7 +2552,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2652,19 +2569,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2727,7 +2643,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -2737,7 +2652,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2752,7 +2666,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2773,19 +2688,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2796,16 +2710,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2815,22 +2728,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -2839,7 +2751,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ToPolkadotXcmRouter`'s transaction calls
@@ -2852,26 +2764,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isCongested
      **/
     reportBridgeStatus: GenericTxCall<
-      Rv,
       (
         bridgeId: H256,
         isCongested: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ToPolkadotXcmRouter';
           palletCall: {
             name: 'ReportBridgeStatus';
             params: { bridgeId: H256; isCongested: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -2884,19 +2795,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2921,14 +2831,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -2940,14 +2848,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -2976,16 +2885,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubKusamaRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AssetHubKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3008,19 +2916,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3042,16 +2949,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubKusamaRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AssetHubKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3067,19 +2973,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubKusamaRuntimeOriginCaller,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AssetHubKusamaRuntimeOriginCaller; call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3101,16 +3006,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubKusamaRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AssetHubKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3126,19 +3030,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubKusamaRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AssetHubKusamaRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3171,19 +3074,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: AssetHubKusamaRuntimeRuntimeCallLike,
         fallback: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: AssetHubKusamaRuntimeRuntimeCallLike; fallback: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3198,26 +3100,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubKusamaRuntimeOriginCaller,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: AssetHubKusamaRuntimeOriginCaller; call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3241,19 +3142,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3305,7 +3205,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3313,7 +3212,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AssetHubKusamaRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3326,7 +3224,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3369,7 +3268,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3377,7 +3275,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3390,7 +3287,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3423,14 +3321,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3442,7 +3338,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3466,27 +3363,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -3508,13 +3404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubKusamaRuntimeProxyType | undefined,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3525,7 +3419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3545,20 +3440,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubKusamaRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubKusamaRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3576,20 +3470,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubKusamaRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubKusamaRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3603,15 +3496,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3640,20 +3532,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AssetHubKusamaRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AssetHubKusamaRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3682,7 +3573,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AssetHubKusamaRuntimeProxyType,
@@ -3690,7 +3580,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3703,7 +3592,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3728,19 +3618,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3760,19 +3649,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3792,19 +3680,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3827,14 +3714,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AssetHubKusamaRuntimeProxyType | undefined,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3846,7 +3731,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3862,22 +3748,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RemoteProxyRelayChain`'s transaction calls
@@ -3901,14 +3786,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRemoteProxyRemoteProxyProof} proof
      **/
     remoteProxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubKusamaRuntimeProxyType | undefined,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
         proof: PalletRemoteProxyRemoteProxyProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RemoteProxyRelayChain';
           palletCall: {
@@ -3920,7 +3803,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proof: PalletRemoteProxyRemoteProxyProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3959,16 +3843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRemoteProxyRemoteProxyProof} proof
      **/
     registerRemoteProxyProof: GenericTxCall<
-      Rv,
       (proof: PalletRemoteProxyRemoteProxyProof) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RemoteProxyRelayChain';
           palletCall: {
             name: 'RegisterRemoteProxyProof';
             params: { proof: PalletRemoteProxyRemoteProxyProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3990,13 +3873,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     remoteProxyWithRegisteredProof: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubKusamaRuntimeProxyType | undefined,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RemoteProxyRelayChain';
           palletCall: {
@@ -4007,14 +3888,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -4037,16 +3919,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4068,19 +3949,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4101,16 +3981,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4134,20 +4013,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4168,16 +4046,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4196,23 +4073,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -4244,20 +4120,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4288,21 +4163,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4323,16 +4197,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4353,16 +4226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4383,16 +4255,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4411,16 +4282,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4443,20 +4313,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4482,20 +4351,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4524,20 +4392,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4566,20 +4433,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4610,21 +4476,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4646,19 +4511,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4678,19 +4542,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4708,16 +4571,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4735,16 +4597,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4764,19 +4625,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4800,21 +4660,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4842,21 +4701,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4876,16 +4734,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4912,7 +4769,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -4920,14 +4776,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4947,16 +4803,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4994,7 +4849,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -5005,7 +4859,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -5021,7 +4874,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5052,20 +4906,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5088,19 +4941,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5124,20 +4976,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5167,21 +5018,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5199,16 +5049,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5231,19 +5080,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5265,19 +5113,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5297,19 +5144,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5332,19 +5178,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5364,19 +5209,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5403,27 +5247,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -5451,19 +5294,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: number,
         admin: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: number; admin: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5491,20 +5333,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: number; owner: MultiAddressLike; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5529,19 +5370,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5563,20 +5403,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: number; item: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5602,20 +5441,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         checkOwner: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number; checkOwner: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5643,20 +5481,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5683,19 +5520,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5715,19 +5551,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5747,19 +5582,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5777,16 +5611,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5804,16 +5637,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5834,19 +5666,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5870,14 +5701,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5889,7 +5718,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5914,20 +5744,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5954,20 +5783,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         maybeCheckDelegate: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; maybeCheckDelegate: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5998,7 +5826,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
@@ -6008,7 +5835,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -6023,7 +5849,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6052,21 +5879,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6091,20 +5917,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6133,21 +5958,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6170,19 +5994,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6209,20 +6032,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6243,16 +6065,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6271,16 +6092,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6301,19 +6121,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6336,14 +6155,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -6355,7 +6172,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6375,27 +6193,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nfts`'s transaction calls
@@ -6422,19 +6239,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     create: GenericTxCall<
-      Rv,
       (
         admin: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Create';
             params: { admin: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6459,19 +6275,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         owner: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCreate';
             params: { owner: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6498,19 +6313,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletNftsDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletNftsDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6538,14 +6352,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintWitness | undefined} witnessData
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         witnessData: PalletNftsMintWitness | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6557,7 +6369,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessData: PalletNftsMintWitness | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6582,21 +6395,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsItemConfig} itemConfig
      **/
     forceMint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         itemConfig: PalletNftsItemConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceMint';
             params: { collection: number; item: number; mintTo: MultiAddressLike; itemConfig: PalletNftsItemConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6617,19 +6429,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6654,20 +6465,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6694,19 +6504,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6726,19 +6535,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     lockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6758,19 +6566,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     unlockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UnlockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6792,19 +6599,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsBitFlags} lockSettings
      **/
     lockCollection: GenericTxCall<
-      Rv,
       (
         collection: number,
         lockSettings: PalletNftsBitFlags,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockCollection';
             params: { collection: number; lockSettings: PalletNftsBitFlags };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6825,19 +6631,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6865,14 +6670,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike | undefined,
         admin: MultiAddressLike | undefined,
         freezer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6884,7 +6687,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6904,19 +6708,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     forceCollectionOwner: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionOwner';
             params: { collection: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6936,19 +6739,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCollectionConfig: GenericTxCall<
-      Rv,
       (
         collection: number,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionConfig';
             params: { collection: number; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6974,21 +6776,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeDeadline
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         maybeDeadline: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike; maybeDeadline: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7013,20 +6814,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7049,19 +6849,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearAllTransferApprovals: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearAllTransferApprovals';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7090,21 +6889,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} lockAttributes
      **/
     lockItemProperties: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         lockMetadata: boolean,
         lockAttributes: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemProperties';
             params: { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7139,7 +6937,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
@@ -7147,7 +6944,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7160,7 +6956,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7191,7 +6988,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     forceSetAttribute: GenericTxCall<
-      Rv,
       (
         setAs: AccountId32Like | undefined,
         collection: number,
@@ -7200,7 +6996,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7214,7 +7009,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7241,14 +7037,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         namespace: PalletNftsAttributeNamespace,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7260,7 +7054,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               key: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7280,20 +7075,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveItemAttributes: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveItemAttributes';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7315,14 +7109,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCancelAttributesApprovalWitness} witness
      **/
     cancelItemAttributesApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         witness: PalletNftsCancelAttributesApprovalWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7334,7 +7126,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletNftsCancelAttributesApprovalWitness;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7361,20 +7154,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7397,19 +7189,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7434,19 +7225,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7467,16 +7257,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7495,16 +7284,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7523,19 +7311,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7554,19 +7341,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintSettings} mintSettings
      **/
     updateMintSettings: GenericTxCall<
-      Rv,
       (
         collection: number,
         mintSettings: PalletNftsMintSettings,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UpdateMintSettings';
             params: { collection: number; mintSettings: PalletNftsMintSettings };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7589,14 +7375,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7608,7 +7392,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7628,20 +7413,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7657,16 +7441,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletNftsItemTip>} tips
      **/
     payTips: GenericTxCall<
-      Rv,
       (tips: Array<PalletNftsItemTip>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'PayTips';
             params: { tips: Array<PalletNftsItemTip> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7696,7 +7479,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     createSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
@@ -7705,7 +7487,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maybePrice: PalletNftsPriceWithDirection | undefined,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7719,7 +7500,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7738,19 +7520,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} offeredItem
      **/
     cancelSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelSwap';
             params: { offeredCollection: number; offeredItem: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7775,7 +7556,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsPriceWithDirection | undefined} witnessPrice
      **/
     claimSwap: GenericTxCall<
-      Rv,
       (
         sendCollection: number,
         sendItem: number,
@@ -7783,7 +7563,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         receiveItem: number,
         witnessPrice: PalletNftsPriceWithDirection | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7796,7 +7575,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessPrice: PalletNftsPriceWithDirection | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7820,20 +7600,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     mintPreSigned: GenericTxCall<
-      Rv,
       (
         mintData: PalletNftsPreSignedMint,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'MintPreSigned';
             params: { mintData: PalletNftsPreSignedMint; signature: SpRuntimeMultiSignature; signer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7857,13 +7636,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     setAttributesPreSigned: GenericTxCall<
-      Rv,
       (
         data: PalletNftsPreSignedAttributes,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7874,14 +7651,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signer: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ForeignAssets`'s transaction calls
@@ -7913,20 +7691,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Create';
             params: { id: StagingXcmV5Location; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7957,21 +7734,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7992,16 +7768,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8022,16 +7797,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8052,16 +7826,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8080,16 +7853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8112,20 +7884,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Mint';
             params: { id: StagingXcmV5Location; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8151,20 +7922,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Burn';
             params: { id: StagingXcmV5Location; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8193,20 +7963,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8235,20 +8004,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8279,21 +8047,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: StagingXcmV5Location; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8315,19 +8082,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8347,19 +8113,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8377,16 +8142,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8404,16 +8168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8433,19 +8196,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8469,14 +8231,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8488,7 +8248,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8516,21 +8277,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: StagingXcmV5Location; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8550,16 +8310,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8586,7 +8345,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
@@ -8594,7 +8352,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8607,7 +8364,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8627,16 +8385,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8674,7 +8431,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
@@ -8685,7 +8441,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8701,7 +8456,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8732,20 +8488,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8768,19 +8523,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8804,20 +8558,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8847,14 +8600,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8866,7 +8617,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8884,16 +8636,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Touch';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8916,19 +8667,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Refund';
             params: { id: StagingXcmV5Location; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8950,19 +8700,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: StagingXcmV5Location; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8982,19 +8731,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9017,19 +8765,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9049,19 +8796,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Block';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9088,27 +8834,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: StagingXcmV5Location; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NftFractionalization`'s transaction calls
@@ -9140,7 +8885,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fractions
      **/
     fractionalize: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
@@ -9148,7 +8892,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         beneficiary: MultiAddressLike,
         fractions: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
@@ -9161,7 +8904,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               fractions: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9189,28 +8933,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     unify: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
         assetId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
             name: 'Unify';
             params: { nftCollectionId: number; nftId: number; assetId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PoolAssets`'s transaction calls
@@ -9242,20 +8985,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9286,21 +9028,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9321,16 +9062,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9351,16 +9091,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9381,16 +9120,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9409,16 +9147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9441,20 +9178,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9480,20 +9216,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9522,20 +9257,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9564,20 +9298,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9608,21 +9341,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9644,19 +9376,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9676,19 +9407,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9706,16 +9436,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9733,16 +9462,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9762,19 +9490,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9798,21 +9525,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9840,21 +9566,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9874,16 +9599,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9910,7 +9634,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -9918,14 +9641,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9945,16 +9668,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9992,7 +9714,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -10003,7 +9724,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
@@ -10019,7 +9739,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10050,20 +9771,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10086,19 +9806,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10122,20 +9841,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10165,21 +9883,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10197,16 +9914,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10229,19 +9945,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10263,19 +9978,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10295,19 +10009,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10330,19 +10043,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10362,19 +10074,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10401,27 +10112,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversion`'s transaction calls
@@ -10437,19 +10147,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'CreatePool';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10478,7 +10187,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} mintTo
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10488,7 +10196,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2Min: bigint,
         mintTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10503,7 +10210,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               mintTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10520,7 +10228,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} withdrawTo
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10529,7 +10236,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2MinReceive: bigint,
         withdrawTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10543,7 +10249,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               withdrawTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10562,7 +10269,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapExactTokensForTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountIn: bigint,
@@ -10570,7 +10276,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10583,7 +10288,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10602,7 +10308,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapTokensForExactTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountOut: bigint,
@@ -10610,7 +10315,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10623,7 +10327,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10644,26 +10349,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     touch: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'Touch';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Recovery`'s transaction calls
@@ -10683,19 +10387,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     asRecovered: GenericTxCall<
-      Rv,
       (
         account: MultiAddressLike,
         call: AssetHubKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'AsRecovered';
             params: { account: MultiAddressLike; call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10713,19 +10416,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     setRecovered: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'SetRecovered';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10752,20 +10454,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayPeriod
      **/
     createRecovery: GenericTxCall<
-      Rv,
       (
         friends: Array<AccountId32Like>,
         threshold: number,
         delayPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CreateRecovery';
             params: { friends: Array<AccountId32Like>; threshold: number; delayPeriod: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10785,16 +10486,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     initiateRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'InitiateRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10816,19 +10516,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     vouchRecovery: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'VouchRecovery';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10846,16 +10545,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     claimRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'ClaimRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10875,16 +10573,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     closeRecovery: GenericTxCall<
-      Rv,
       (rescuer: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CloseRecovery';
             params: { rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10903,15 +10600,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeRecovery: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'RemoveRecovery';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10927,16 +10623,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     cancelRecovered: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CancelRecovered';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10968,23 +10663,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeAccount
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (maybeAccount: MultiAddressLike | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'PokeDeposit';
             params: { maybeAccount: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Society`'s transaction calls
@@ -11004,16 +10698,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     bid: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Bid';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11028,15 +10721,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unbid: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unbid';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11064,20 +10756,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} tip
      **/
     vouch: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         value: bigint,
         tip: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vouch';
             params: { who: MultiAddressLike; value: bigint; tip: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11092,15 +10783,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unvouch: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unvouch';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11118,19 +10808,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         candidate: MultiAddressLike,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vote';
             params: { candidate: MultiAddressLike; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11146,16 +10835,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     defenderVote: GenericTxCall<
-      Rv,
       (approve: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DefenderVote';
             params: { approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11173,15 +10861,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     payout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Payout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11192,16 +10879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     waiveRepay: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'WaiveRepay';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11232,7 +10918,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} rules
      **/
     foundSociety: GenericTxCall<
-      Rv,
       (
         founder: MultiAddressLike,
         maxMembers: number,
@@ -11241,7 +10926,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         candidateDeposit: bigint,
         rules: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
@@ -11255,7 +10939,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               rules: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11268,15 +10953,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     dissolve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Dissolve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11300,19 +10984,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} forgive
      **/
     judgeSuspendedMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         forgive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'JudgeSuspendedMember';
             params: { who: MultiAddressLike; forgive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11336,21 +11019,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} candidateDeposit
      **/
     setParameters: GenericTxCall<
-      Rv,
       (
         maxMembers: number,
         maxIntake: number,
         maxStrikes: number,
         candidateDeposit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'SetParameters';
             params: { maxMembers: number; maxIntake: number; maxStrikes: number; candidateDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11360,15 +11042,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     punishSkeptic: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'PunishSkeptic';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11378,15 +11059,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimMembership: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ClaimMembership';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11398,16 +11078,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     bestowMembership: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'BestowMembership';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11421,16 +11100,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     kickCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'KickCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11441,15 +11119,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resignCandidacy: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ResignCandidacy';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11463,16 +11140,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     dropCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DropCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11485,19 +11161,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupCandidacy: GenericTxCall<
-      Rv,
       (
         candidate: AccountId32Like,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupCandidacy';
             params: { candidate: AccountId32Like; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11510,19 +11185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupChallenge: GenericTxCall<
-      Rv,
       (
         challengeRound: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupChallenge';
             params: { challengeRound: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11537,22 +11211,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Revive`'s transaction calls
@@ -11578,16 +11251,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} payload
      **/
     ethTransact: GenericTxCall<
-      Rv,
       (payload: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'EthTransact';
             params: { payload: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11616,7 +11288,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: bigint,
@@ -11624,7 +11295,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -11637,7 +11307,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11656,7 +11327,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -11665,7 +11335,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -11679,7 +11348,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11720,7 +11390,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -11729,7 +11398,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -11743,7 +11411,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11763,7 +11432,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     ethInstantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: U256,
         gasLimit: SpWeightsWeightV2Weight,
@@ -11771,7 +11439,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         code: BytesLike,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -11784,7 +11451,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11799,7 +11467,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     ethCall: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: U256,
@@ -11807,7 +11474,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -11820,7 +11486,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11842,19 +11509,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} storageDepositLimit
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UploadCode';
             params: { code: BytesLike; storageDepositLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11867,16 +11533,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11896,19 +11561,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: H160,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'SetCode';
             params: { dest: H160; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11920,15 +11584,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     mapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'MapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11940,15 +11603,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unmapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UnmapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11962,23 +11624,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallbackAccount: GenericTxCall<
-      Rv,
       (call: AssetHubKusamaRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'DispatchAsFallbackAccount';
             params: { call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -11992,16 +11653,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12033,13 +11693,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -12050,7 +11708,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12064,19 +11723,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12093,20 +11751,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12116,16 +11773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12144,26 +11800,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -12191,19 +11846,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12219,16 +11873,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12244,15 +11897,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12293,19 +11945,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12321,19 +11972,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12365,19 +12015,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12406,21 +12055,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12439,7 +12087,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -12447,7 +12094,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12460,7 +12106,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12482,19 +12129,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12514,19 +12160,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12540,19 +12185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12577,7 +12221,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -12586,7 +12229,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12600,7 +12242,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12619,14 +12262,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12638,7 +12279,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12664,16 +12306,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12692,19 +12333,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12720,16 +12360,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12742,16 +12381,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12766,19 +12404,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12793,19 +12430,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12819,19 +12455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12856,16 +12491,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12881,16 +12515,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12904,19 +12537,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12934,16 +12566,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12961,16 +12592,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12988,23 +12618,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -13025,16 +12654,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13053,16 +12681,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13075,26 +12702,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingRcClient`'s transaction calls
@@ -13106,16 +12732,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientSessionReport} report
      **/
     relaySessionReport: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientSessionReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelaySessionReport';
             params: { report: PalletStakingAsyncRcClientSessionReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13124,23 +12749,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletStakingAsyncRcClientOffence]>} offences
      **/
     relayNewOffencePaged: GenericTxCall<
-      Rv,
       (offences: Array<[number, PalletStakingAsyncRcClientOffence]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelayNewOffencePaged';
             params: { offences: Array<[number, PalletStakingAsyncRcClientOffence]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElection`'s transaction calls
@@ -13156,23 +12780,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockAdminOperation} op
      **/
     manage: GenericTxCall<
-      Rv,
       (op: PalletElectionProviderMultiBlockAdminOperation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElection';
           palletCall: {
             name: 'Manage';
             params: { op: PalletElectionProviderMultiBlockAdminOperation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s transaction calls
@@ -13181,7 +12804,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionUnsigned`'s transaction calls
@@ -13207,23 +12830,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockPagedRawSolution} pagedSolution
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionUnsigned';
           palletCall: {
             name: 'SubmitUnsigned';
             params: { pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s transaction calls
@@ -13235,16 +12857,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore} claimedScore
      **/
     register: GenericTxCall<
-      Rv,
       (claimedScore: SpNposElectionsElectionScore) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Register';
             params: { claimedScore: SpNposElectionsElectionScore };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13262,19 +12883,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeStakingNposCompactSolution24 | undefined} maybeSolution
      **/
     submitPage: GenericTxCall<
-      Rv,
       (
         page: number,
         maybeSolution: AssetHubKusamaRuntimeStakingNposCompactSolution24 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SubmitPage';
             params: { page: number; maybeSolution: AssetHubKusamaRuntimeStakingNposCompactSolution24 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13287,15 +12907,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bail: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Bail';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13311,19 +12930,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessPages
      **/
     clearOldRoundData: GenericTxCall<
-      Rv,
       (
         round: number,
         witnessPages: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'ClearOldRoundData';
             params: { round: number; witnessPages: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13335,23 +12953,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} inv
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (inv: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SetInvulnerables';
             params: { inv: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -13375,19 +12992,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingAsyncRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13406,16 +13022,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13443,16 +13058,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13480,16 +13094,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13503,16 +13116,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingAsyncValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingAsyncValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13526,16 +13138,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13553,15 +13164,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13575,16 +13185,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingAsyncRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13600,15 +13209,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13620,16 +13228,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13642,16 +13249,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13664,16 +13270,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13690,15 +13295,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13716,15 +13320,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13736,16 +13339,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13763,19 +13365,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13792,15 +13393,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13821,19 +13421,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Perbill]>} validatorSlashes
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         validatorSlashes: Array<[AccountId32Like, Perbill]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; validatorSlashes: Array<[AccountId32Like, Perbill]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13856,19 +13455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13880,16 +13478,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13917,19 +13514,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13949,16 +13545,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13990,7 +13585,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingAsyncPalletConfigOp,
         minValidatorBond: PalletStakingAsyncPalletConfigOp,
@@ -14000,7 +13594,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingAsyncPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14015,7 +13608,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14050,16 +13644,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14071,16 +13664,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14093,16 +13685,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14130,20 +13721,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14158,16 +13748,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14183,16 +13772,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14215,14 +13803,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingAsyncLedgerUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14234,7 +13820,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14250,16 +13837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14302,19 +13888,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[AccountId32Like, Perbill, number]} slashKey
      **/
     applySlash: GenericTxCall<
-      Rv,
       (
         slashEra: number,
         slashKey: [AccountId32Like, Perbill, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ApplySlash';
             params: { slashEra: number; slashKey: [AccountId32Like, Perbill, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14334,23 +13919,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     pruneEraStep: GenericTxCall<
-      Rv,
       (era: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PruneEraStep';
             params: { era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -14379,19 +13963,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14421,16 +14004,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14468,14 +14050,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: ParachainsCommonPayVersionedLocatableAccount,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -14487,7 +14067,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14517,16 +14098,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14556,16 +14136,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14590,23 +14169,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -14627,19 +14205,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14674,14 +14251,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -14693,7 +14268,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14716,16 +14292,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14744,19 +14319,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14795,19 +14369,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14834,27 +14407,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -14876,13 +14448,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: AssetHubKusamaRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -14893,7 +14463,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14910,16 +14481,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14935,16 +14505,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14959,16 +14528,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14983,16 +14551,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15005,16 +14572,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15032,16 +14598,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15057,16 +14622,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15083,26 +14647,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -15113,16 +14676,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15131,16 +14693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15151,20 +14712,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15173,23 +14733,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: AssetHubKusamaRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: AssetHubKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -15213,19 +14772,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15241,16 +14799,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15267,20 +14824,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15306,16 +14862,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15331,16 +14886,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15360,19 +14914,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15389,16 +14942,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15416,16 +14968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15444,19 +14995,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15478,20 +15028,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15515,23 +15064,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -15563,20 +15111,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15603,21 +15150,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15646,19 +15192,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15702,19 +15247,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15742,20 +15286,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15781,19 +15324,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15825,26 +15367,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -15860,19 +15401,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15886,19 +15426,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15911,23 +15450,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhOps`'s transaction calls
@@ -15948,13 +15486,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveLeaseDeposit: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -15965,7 +15501,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15983,13 +15520,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     withdrawCrowdloanContribution: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -16000,7 +15535,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16019,13 +15555,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveCrowdloanReserve: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -16036,7 +15570,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16049,23 +15584,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} assetId
      **/
     transferToPostMigrationTreasury: GenericTxCall<
-      Rv,
       (assetId: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'TransferToPostMigrationTreasury';
             params: { assetId: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhMigrator`'s transaction calls
@@ -16079,16 +15613,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorAccountsAccount>} accounts
      **/
     receiveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorAccountsAccount>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAccounts';
             params: { accounts: Array<PalletRcMigratorAccountsAccount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16102,16 +15635,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorMultisigRcMultisig>} accounts
      **/
     receiveMultisigs: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorMultisigRcMultisig>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveMultisigs';
             params: { accounts: Array<PalletRcMigratorMultisigRcMultisig> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16121,16 +15653,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxy>} proxies
      **/
     receiveProxyProxies: GenericTxCall<
-      Rv,
       (proxies: Array<PalletRcMigratorProxyRcProxy>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyProxies';
             params: { proxies: Array<PalletRcMigratorProxyRcProxy> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16140,16 +15671,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxyAnnouncement>} announcements
      **/
     receiveProxyAnnouncements: GenericTxCall<
-      Rv,
       (announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyAnnouncements';
             params: { announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16158,16 +15688,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageChunksRcPreimageChunk>} chunks
      **/
     receivePreimageChunks: GenericTxCall<
-      Rv,
       (chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageChunks';
             params: { chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16176,16 +15705,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>} requestStatus
      **/
     receivePreimageRequestStatus: GenericTxCall<
-      Rv,
       (requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageRequestStatus';
             params: { requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16194,18 +15722,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>} legacyStatus
      **/
     receivePreimageLegacyStatus: GenericTxCall<
-      Rv,
       (
         legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageLegacyStatus';
             params: { legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16214,16 +15741,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>} messages
      **/
     receiveNomPoolsMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveNomPoolsMessages';
             params: { messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16232,16 +15758,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorVestingRcVestingSchedule>} schedules
      **/
     receiveVestingSchedules: GenericTxCall<
-      Rv,
       (schedules: Array<PalletRcMigratorVestingRcVestingSchedule>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveVestingSchedules';
             params: { schedules: Array<PalletRcMigratorVestingRcVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16251,16 +15776,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorReferendaReferendaMessage>} values
      **/
     receiveReferendaValues: GenericTxCall<
-      Rv,
       (values: Array<PalletRcMigratorReferendaReferendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaValues';
             params: { values: Array<PalletRcMigratorReferendaReferendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16270,16 +15794,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletReferendaReferendumInfo]>} referendums
      **/
     receiveReferendums: GenericTxCall<
-      Rv,
       (referendums: Array<[number, PalletReferendaReferendumInfo]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendums';
             params: { referendums: Array<[number, PalletReferendaReferendumInfo]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16288,16 +15811,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorClaimsRcClaimsMessage>} messages
      **/
     receiveClaims: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorClaimsRcClaimsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveClaims';
             params: { messages: Array<PalletRcMigratorClaimsRcClaimsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16306,16 +15828,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>} messages
      **/
     receiveBagsListMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBagsListMessages';
             params: { messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16324,16 +15845,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerRcSchedulerMessage>} messages
      **/
     receiveSchedulerMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerMessages';
             params: { messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16342,16 +15862,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorIndicesRcIndicesIndex>} indices
      **/
     receiveIndices: GenericTxCall<
-      Rv,
       (indices: Array<PalletRcMigratorIndicesRcIndicesIndex>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveIndices';
             params: { indices: Array<PalletRcMigratorIndicesRcIndicesIndex> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16360,16 +15879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>} messages
      **/
     receiveConvictionVotingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveConvictionVotingMessages';
             params: { messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16378,16 +15896,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorBountiesRcBountiesMessage>} messages
      **/
     receiveBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorBountiesRcBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBountiesMessages';
             params: { messages: Array<PalletRcMigratorBountiesRcBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16396,16 +15913,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>} rates
      **/
     receiveAssetRates: GenericTxCall<
-      Rv,
       (rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAssetRates';
             params: { rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16414,16 +15930,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>} messages
      **/
     receiveCrowdloanMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveCrowdloanMessages';
             params: { messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16432,16 +15947,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, H256]>} metadata
      **/
     receiveReferendaMetadata: GenericTxCall<
-      Rv,
       (metadata: Array<[number, H256]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaMetadata';
             params: { metadata: Array<[number, H256]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16450,16 +15964,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorTreasuryPortableTreasuryMessage>} messages
      **/
     receiveTreasuryMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveTreasuryMessages';
             params: { messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16468,16 +15981,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>} messages
      **/
     receiveSchedulerAgendaMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerAgendaMessages';
             params: { messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16486,18 +15998,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>} messages
      **/
     receiveDelegatedStakingMessages: GenericTxCall<
-      Rv,
       (
         messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveDelegatedStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16506,16 +16017,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>} messages
      **/
     receiveChildBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveChildBountiesMessages';
             params: { messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16524,16 +16034,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingMessagePortableStakingMessage>} messages
      **/
     receiveStakingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16542,16 +16051,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorRecoveryPortableRecoveryMessage>} messages
      **/
     receiveRecoveryMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorRecoveryPortableRecoveryMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveRecoveryMessages';
             params: { messages: Array<PalletRcMigratorRecoveryPortableRecoveryMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16560,16 +16068,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSocietyPortableSocietyMessage>} messages
      **/
     receiveSocietyMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSocietyPortableSocietyMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSocietyMessages';
             params: { messages: Array<PalletRcMigratorSocietyPortableSocietyMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16582,16 +16089,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAhMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletAhMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletAhMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16603,15 +16109,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'StartMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16623,16 +16128,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setDmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetDmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16645,16 +16149,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16671,19 +16174,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} coolOffEndAt
      **/
     finishMigration: GenericTxCall<
-      Rv,
       (
         data: PalletRcMigratorMigrationFinishedData | undefined,
         coolOffEndAt: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'FinishMigration';
             params: { data: PalletRcMigratorMigrationFinishedData | undefined; coolOffEndAt: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16696,25 +16198,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/kusama-asset-hub/view-functions.d.ts b/packages/chaintypes/src/kusama-asset-hub/view-functions.d.ts
index c29a1cef..65f1385e 100644
--- a/packages/chaintypes/src/kusama-asset-hub/view-functions.d.ts
+++ b/packages/chaintypes/src/kusama-asset-hub/view-functions.d.ts
@@ -1,10 +1,10 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type { AssetHubKusamaRuntimeRuntimeCallLike, AssetHubKusamaRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -16,7 +16,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubKusamaRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: AssetHubKusamaRuntimeRuntimeCallLike, proxyType: AssetHubKusamaRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -27,14 +26,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubKusamaRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: AssetHubKusamaRuntimeProxyType, against: AssetHubKusamaRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -51,12 +49,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s view functions
@@ -72,11 +70,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AccountId32Like} who
      * @param {number} pages
      **/
-    depositFor: GenericViewFunction<Rv, (who: AccountId32Like, pages: number) => Promise<bigint>>;
+    depositFor: GenericViewFunction<(who: AccountId32Like, pages: number) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/consts.d.ts b/packages/chaintypes/src/kusama-people/consts.d.ts
index d2357046..1979e12f 100644
--- a/packages/chaintypes/src/kusama-people/consts.d.ts
+++ b/packages/chaintypes/src/kusama-people/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, AccountId32 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   SpWeightsWeightV2Weight,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/kusama-people/errors.d.ts b/packages/chaintypes/src/kusama-people/errors.d.ts
index 2a44b227..9ba718f1 100644
--- a/packages/chaintypes/src/kusama-people/errors.d.ts
+++ b/packages/chaintypes/src/kusama-people/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -108,12 +108,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -122,67 +122,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -191,92 +191,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -285,32 +285,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -319,32 +319,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -354,152 +354,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -509,32 +509,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -542,24 +542,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -568,12 +568,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -582,78 +582,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -662,47 +662,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -711,157 +711,157 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/events.d.ts b/packages/chaintypes/src/kusama-people/events.d.ts
index 7c9d97cd..53161f64 100644
--- a/packages/chaintypes/src/kusama-people/events.d.ts
+++ b/packages/chaintypes/src/kusama-people/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, FixedBytes, Bytes, Result } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -23,7 +23,7 @@ import type {
   PalletProxyDepositKind,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -31,18 +31,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -51,33 +45,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -86,7 +79,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -95,13 +88,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -110,18 +102,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -131,7 +122,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -140,7 +130,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -152,7 +142,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -171,20 +160,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -199,7 +187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -219,7 +206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -241,7 +227,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -261,7 +246,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -275,7 +259,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -284,40 +268,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -326,87 +309,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -417,7 +400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -426,7 +408,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -436,7 +418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -445,18 +426,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -465,13 +445,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -481,7 +460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -490,13 +468,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -507,7 +484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -516,7 +492,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -526,28 +502,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -556,12 +532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -570,13 +546,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -591,7 +566,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -606,7 +580,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -618,7 +591,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -629,7 +601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -640,7 +611,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -652,7 +622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -669,7 +638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -681,7 +649,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -693,7 +660,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -709,7 +675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -718,13 +683,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -736,7 +700,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -747,7 +710,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -758,7 +720,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -769,7 +730,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -785,7 +745,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -797,7 +756,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -813,7 +771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -823,7 +780,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -834,7 +790,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -844,7 +799,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -854,7 +808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -863,14 +816,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -880,7 +832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -890,7 +841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -899,7 +849,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -909,29 +859,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -941,7 +886,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -969,7 +913,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1004,7 +947,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1034,7 +976,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1053,7 +994,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1063,47 +1004,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1113,7 +1054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1123,7 +1063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1133,7 +1072,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1149,7 +1087,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1159,7 +1096,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1168,7 +1104,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1177,14 +1113,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: PeopleKusamaRuntimeProxyType; disambiguationIndex: number }
@@ -1194,7 +1129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       { pure: AccountId32; spawner: AccountId32; proxyType: PeopleKusamaRuntimeProxyType; disambiguationIndex: number }
@@ -1203,13 +1137,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeopleKusamaRuntimeProxyType; delay: number }
@@ -1219,7 +1152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeopleKusamaRuntimeProxyType; delay: number }
@@ -1229,7 +1161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1238,7 +1169,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1247,23 +1178,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1273,7 +1203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1282,23 +1211,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1308,7 +1231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -1317,18 +1239,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1339,7 +1255,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1348,23 +1263,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1373,19 +1287,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1394,21 +1307,21 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/index.d.ts b/packages/chaintypes/src/kusama-people/index.d.ts
index ed77b9ee..4675ef95 100644
--- a/packages/chaintypes/src/kusama-people/index.d.ts
+++ b/packages/chaintypes/src/kusama-people/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PeopleKusamaRuntimeRuntimeCall,
@@ -41,26 +41,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedKusamaPeopleApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: KusamaPeopleApi
  * @specVersion: 1009001
  **/
-export interface KusamaPeopleApi {
-  legacy: VersionedKusamaPeopleApi<RpcLegacy>;
-  v2: VersionedKusamaPeopleApi<RpcV2>;
+export interface KusamaPeopleApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/kusama-people/json-rpc.d.ts b/packages/chaintypes/src/kusama-people/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/kusama-people/json-rpc.d.ts
+++ b/packages/chaintypes/src/kusama-people/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/kusama-people/query.d.ts b/packages/chaintypes/src/kusama-people/query.d.ts
index 77a44ff1..d989ed3e 100644
--- a/packages/chaintypes/src/kusama-people/query.d.ts
+++ b/packages/chaintypes/src/kusama-people/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -67,7 +67,7 @@ import type {
   PalletIdentityProvider,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -78,35 +78,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -114,7 +114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -122,28 +122,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -156,14 +156,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -180,21 +180,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -202,21 +202,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -229,12 +229,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -250,7 +250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -260,7 +260,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -274,7 +273,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -285,7 +284,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -294,14 +293,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -310,7 +309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -323,7 +322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -334,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -346,7 +345,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -360,7 +359,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -374,7 +372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -384,7 +382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -395,7 +393,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -406,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -416,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -425,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -435,7 +431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -446,7 +441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -455,21 +450,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -477,7 +472,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -485,7 +480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -493,7 +488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -502,12 +497,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -518,7 +513,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -528,12 +523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -543,12 +538,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -561,7 +556,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -572,12 +567,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -588,14 +583,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -626,7 +621,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -637,7 +632,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -647,7 +642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -655,7 +650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -663,12 +658,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -678,18 +673,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -700,12 +695,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -716,7 +711,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -727,7 +722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -735,7 +730,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -744,7 +739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -753,12 +748,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -769,14 +764,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -784,7 +779,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -792,7 +787,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PeopleKusamaRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PeopleKusamaRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PeopleKusamaRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -803,7 +798,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -811,11 +806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PeopleKusamaRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PeopleKusamaRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PeopleKusamaRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -824,7 +815,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -832,7 +822,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -843,7 +833,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -852,12 +842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -872,7 +862,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -882,12 +872,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -905,7 +895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -917,7 +907,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -926,7 +916,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -938,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -948,14 +936,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -964,7 +952,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -972,7 +959,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -983,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -991,7 +978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1002,7 +989,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1010,7 +997,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1019,7 +1006,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1031,7 +1017,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1044,7 +1029,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1056,14 +1040,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1072,7 +1056,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1084,7 +1067,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1094,7 +1076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1107,7 +1089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1119,7 +1101,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1130,7 +1112,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1138,7 +1119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1151,7 +1132,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1161,7 +1141,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1170,7 +1150,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1178,7 +1157,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1191,7 +1170,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1199,7 +1177,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1212,11 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1224,16 +1198,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1248,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -1256,7 +1226,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1265,7 +1235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1277,7 +1247,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1287,7 +1257,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1295,7 +1265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1308,7 +1278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1322,7 +1292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1336,11 +1305,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/runtime.d.ts b/packages/chaintypes/src/kusama-people/runtime.d.ts
index e6e06fcb..721c452c 100644
--- a/packages/chaintypes/src/kusama-people/runtime.d.ts
+++ b/packages/chaintypes/src/kusama-people/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -49,7 +49,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -61,19 +61,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -84,12 +84,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -111,12 +111,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -127,7 +127,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -135,7 +135,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -143,12 +143,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -159,7 +159,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -170,7 +170,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -179,12 +179,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -200,7 +200,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -211,7 +210,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -220,7 +219,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -232,14 +230,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -262,7 +259,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -275,7 +271,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -287,12 +283,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -310,7 +306,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -321,14 +317,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -340,12 +335,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -358,7 +353,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -369,7 +363,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -378,19 +371,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -404,7 +397,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PeopleKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -416,7 +408,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PeopleKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -426,7 +417,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -434,12 +425,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -456,7 +447,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -471,7 +461,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -488,7 +477,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -507,7 +495,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -517,7 +504,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -532,7 +519,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PeopleKusamaRuntimeOriginCaller,
         call: PeopleKusamaRuntimeRuntimeCallLike,
@@ -548,7 +534,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -558,7 +543,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -571,14 +556,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -596,7 +580,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -615,7 +598,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -625,7 +607,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -638,7 +620,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -652,7 +633,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -662,7 +642,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -677,12 +657,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -693,12 +673,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -719,7 +699,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -740,7 +720,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -750,11 +730,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/tx.d.ts b/packages/chaintypes/src/kusama-people/tx.d.ts
index b110ad9e..5b774156 100644
--- a/packages/chaintypes/src/kusama-people/tx.d.ts
+++ b/packages/chaintypes/src/kusama-people/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type { MultiAddressLike, Extrinsic, BytesLike, H256, AccountId32Like, FixedBytes, Data } from 'dedot/codecs';
 import type {
@@ -38,16 +36,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PeopleKusamaRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PeopleKusamaRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -60,16 +60,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -79,16 +78,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -98,16 +96,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -120,16 +117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -139,16 +135,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -158,16 +153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -181,19 +175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -203,16 +196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -225,16 +217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -251,16 +242,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -278,23 +268,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -315,12 +304,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -330,7 +317,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -339,23 +327,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -385,23 +372,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -410,7 +396,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -426,16 +412,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -452,20 +437,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -477,15 +461,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -499,23 +482,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -534,19 +516,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -559,20 +540,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -588,19 +568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -625,19 +604,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -650,19 +628,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -679,16 +656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -701,19 +677,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -728,19 +703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -757,26 +731,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -800,16 +773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -823,16 +795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -848,16 +819,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -869,15 +839,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -890,15 +859,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -911,16 +879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -933,16 +900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -958,16 +924,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -984,26 +949,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1024,19 +988,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PeopleKusamaRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PeopleKusamaRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1056,22 +1019,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -1084,15 +1046,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1105,15 +1066,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1127,16 +1087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1150,16 +1109,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1173,23 +1131,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -1201,19 +1158,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1245,14 +1201,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1264,7 +1218,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1308,14 +1263,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1327,7 +1280,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1345,19 +1299,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1373,19 +1326,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1399,16 +1351,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1421,16 +1372,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1445,16 +1395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1497,7 +1446,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1505,7 +1453,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1518,7 +1465,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1549,7 +1497,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1557,7 +1504,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1570,7 +1516,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1583,16 +1530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1638,7 +1584,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1646,7 +1591,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1659,7 +1603,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1675,19 +1620,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1750,7 +1694,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -1760,7 +1703,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1775,7 +1717,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1796,19 +1739,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1819,16 +1761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1838,22 +1779,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -1862,7 +1802,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -1875,19 +1815,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1912,14 +1851,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -1931,14 +1868,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1967,16 +1905,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleKusamaRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PeopleKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PeopleKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1999,19 +1936,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PeopleKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2033,16 +1969,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleKusamaRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PeopleKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PeopleKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2058,19 +1993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PeopleKusamaRuntimeOriginCaller,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PeopleKusamaRuntimeOriginCaller; call: PeopleKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2092,16 +2026,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleKusamaRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PeopleKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PeopleKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2117,19 +2050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PeopleKusamaRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PeopleKusamaRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2162,19 +2094,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PeopleKusamaRuntimeRuntimeCallLike,
         fallback: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PeopleKusamaRuntimeRuntimeCallLike; fallback: PeopleKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2189,26 +2120,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PeopleKusamaRuntimeOriginCaller,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PeopleKusamaRuntimeOriginCaller; call: PeopleKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -2232,19 +2162,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PeopleKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2296,7 +2225,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2304,7 +2232,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PeopleKusamaRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2317,7 +2244,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2360,7 +2288,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2368,7 +2295,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2381,7 +2307,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2414,14 +2341,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2433,7 +2358,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2457,27 +2383,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2499,13 +2424,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PeopleKusamaRuntimeProxyType | undefined,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2516,7 +2439,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeopleKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2536,20 +2460,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeopleKusamaRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PeopleKusamaRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2567,20 +2490,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeopleKusamaRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PeopleKusamaRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2594,15 +2516,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2631,20 +2552,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PeopleKusamaRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PeopleKusamaRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2673,7 +2593,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PeopleKusamaRuntimeProxyType,
@@ -2681,7 +2600,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2694,7 +2612,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2719,19 +2638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2751,19 +2669,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2783,19 +2700,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2818,14 +2734,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PeopleKusamaRuntimeProxyType | undefined,
         call: PeopleKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2837,7 +2751,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeopleKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2853,22 +2768,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2886,16 +2800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2914,16 +2827,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleKusamaRuntimePeopleIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PeopleKusamaRuntimePeopleIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PeopleKusamaRuntimePeopleIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2941,16 +2853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2966,15 +2877,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3000,19 +2910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3031,16 +2940,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3057,19 +2965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3086,19 +2993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3115,19 +3021,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3154,21 +3059,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3189,16 +3093,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3215,19 +3118,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3241,19 +3143,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3269,16 +3170,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3296,15 +3196,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3320,20 +3219,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3344,19 +3242,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3381,14 +3278,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -3400,7 +3295,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3411,16 +3307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3432,16 +3327,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3451,16 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3472,16 +3365,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3492,16 +3384,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3512,22 +3403,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/kusama-people/view-functions.d.ts b/packages/chaintypes/src/kusama-people/view-functions.d.ts
index bb8d3257..4296f903 100644
--- a/packages/chaintypes/src/kusama-people/view-functions.d.ts
+++ b/packages/chaintypes/src/kusama-people/view-functions.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { PeopleKusamaRuntimeRuntimeCallLike, PeopleKusamaRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -15,7 +15,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeopleKusamaRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PeopleKusamaRuntimeRuntimeCallLike, proxyType: PeopleKusamaRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -26,13 +25,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeopleKusamaRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: PeopleKusamaRuntimeProxyType, against: PeopleKusamaRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/kusama/consts.d.ts b/packages/chaintypes/src/kusama/consts.d.ts
index 633ca030..94cc7eb1 100644
--- a/packages/chaintypes/src/kusama/consts.d.ts
+++ b/packages/chaintypes/src/kusama/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, AccountId32, Bytes, Perbill, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   StagingXcmV5Junctions,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/kusama/errors.d.ts b/packages/chaintypes/src/kusama/errors.d.ts
index d19d3925..f3b82343 100644
--- a/packages/chaintypes/src/kusama/errors.d.ts
+++ b/packages/chaintypes/src/kusama/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -68,27 +68,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -97,32 +97,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -131,67 +131,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -200,182 +200,182 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -384,32 +384,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -419,43 +419,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -464,63 +464,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -529,68 +529,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -599,77 +599,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FellowshipCollective`'s errors
@@ -678,62 +678,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Account is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * The given poll index is unknown or has closed.
      **/
-    NotPolling: GenericPalletError<Rv>;
+    NotPolling: GenericPalletError;
 
     /**
      * The given poll is still ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * There are no further records to be removed.
      **/
-    NoneRemaining: GenericPalletError<Rv>;
+    NoneRemaining: GenericPalletError;
 
     /**
      * Unexpected error in state.
      **/
-    Corruption: GenericPalletError<Rv>;
+    Corruption: GenericPalletError;
 
     /**
      * The member's rank is too low to vote.
      **/
-    RankTooLow: GenericPalletError<Rv>;
+    RankTooLow: GenericPalletError;
 
     /**
      * The information provided is incorrect.
      **/
-    InvalidWitness: GenericPalletError<Rv>;
+    InvalidWitness: GenericPalletError;
 
     /**
      * The origin is not sufficiently privileged to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The new member to exchange is the same as the old member
      **/
-    SameMember: GenericPalletError<Rv>;
+    SameMember: GenericPalletError;
 
     /**
      * The max member count for the rank has been reached.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FellowshipReferenda`'s errors
@@ -742,77 +742,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -821,32 +821,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -855,38 +855,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -895,12 +895,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Society`'s errors
@@ -909,172 +909,172 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * User is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * User is suspended.
      **/
-    Suspended: GenericPalletError<Rv>;
+    Suspended: GenericPalletError;
 
     /**
      * User is not suspended.
      **/
-    NotSuspended: GenericPalletError<Rv>;
+    NotSuspended: GenericPalletError;
 
     /**
      * Nothing to payout.
      **/
-    NoPayout: GenericPalletError<Rv>;
+    NoPayout: GenericPalletError;
 
     /**
      * Society already founded.
      **/
-    AlreadyFounded: GenericPalletError<Rv>;
+    AlreadyFounded: GenericPalletError;
 
     /**
      * Not enough in pot to accept candidate.
      **/
-    InsufficientPot: GenericPalletError<Rv>;
+    InsufficientPot: GenericPalletError;
 
     /**
      * Member is already vouching or banned from vouching again.
      **/
-    AlreadyVouching: GenericPalletError<Rv>;
+    AlreadyVouching: GenericPalletError;
 
     /**
      * Member is not vouching.
      **/
-    NotVouchingOnBidder: GenericPalletError<Rv>;
+    NotVouchingOnBidder: GenericPalletError;
 
     /**
      * Cannot remove the head of the chain.
      **/
-    Head: GenericPalletError<Rv>;
+    Head: GenericPalletError;
 
     /**
      * Cannot remove the founder.
      **/
-    Founder: GenericPalletError<Rv>;
+    Founder: GenericPalletError;
 
     /**
      * User has already made a bid.
      **/
-    AlreadyBid: GenericPalletError<Rv>;
+    AlreadyBid: GenericPalletError;
 
     /**
      * User is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * User is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * Too many members in the society.
      **/
-    MaxMembers: GenericPalletError<Rv>;
+    MaxMembers: GenericPalletError;
 
     /**
      * The caller is not the founder.
      **/
-    NotFounder: GenericPalletError<Rv>;
+    NotFounder: GenericPalletError;
 
     /**
      * The caller is not the head.
      **/
-    NotHead: GenericPalletError<Rv>;
+    NotHead: GenericPalletError;
 
     /**
      * The membership cannot be claimed as the candidate was not clearly approved.
      **/
-    NotApproved: GenericPalletError<Rv>;
+    NotApproved: GenericPalletError;
 
     /**
      * The candidate cannot be kicked as the candidate was not clearly rejected.
      **/
-    NotRejected: GenericPalletError<Rv>;
+    NotRejected: GenericPalletError;
 
     /**
      * The candidacy cannot be dropped as the candidate was clearly approved.
      **/
-    Approved: GenericPalletError<Rv>;
+    Approved: GenericPalletError;
 
     /**
      * The candidacy cannot be bestowed as the candidate was clearly rejected.
      **/
-    Rejected: GenericPalletError<Rv>;
+    Rejected: GenericPalletError;
 
     /**
      * The candidacy cannot be concluded as the voting is still in progress.
      **/
-    InProgress: GenericPalletError<Rv>;
+    InProgress: GenericPalletError;
 
     /**
      * The candidacy cannot be pruned until a full additional intake period has passed.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The skeptic already voted.
      **/
-    Voted: GenericPalletError<Rv>;
+    Voted: GenericPalletError;
 
     /**
      * The skeptic need not vote on candidates from expired rounds.
      **/
-    Expired: GenericPalletError<Rv>;
+    Expired: GenericPalletError;
 
     /**
      * User is not a bidder.
      **/
-    NotBidder: GenericPalletError<Rv>;
+    NotBidder: GenericPalletError;
 
     /**
      * There is no defender currently.
      **/
-    NoDefender: GenericPalletError<Rv>;
+    NoDefender: GenericPalletError;
 
     /**
      * Group doesn't exist.
      **/
-    NotGroup: GenericPalletError<Rv>;
+    NotGroup: GenericPalletError;
 
     /**
      * The member is already elevated to this rank.
      **/
-    AlreadyElevated: GenericPalletError<Rv>;
+    AlreadyElevated: GenericPalletError;
 
     /**
      * The skeptic has already been punished for this offence.
      **/
-    AlreadyPunished: GenericPalletError<Rv>;
+    AlreadyPunished: GenericPalletError;
 
     /**
      * Funds are insufficient to pay off society debts.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The candidate/defender has no stale votes to remove.
      **/
-    NoVotes: GenericPalletError<Rv>;
+    NoVotes: GenericPalletError;
 
     /**
      * There is no deposit associated with a bid.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Recovery`'s errors
@@ -1083,87 +1083,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not allowed to make a call on behalf of this account
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Threshold must be greater than zero
      **/
-    ZeroThreshold: GenericPalletError<Rv>;
+    ZeroThreshold: GenericPalletError;
 
     /**
      * Friends list must be greater than zero and threshold
      **/
-    NotEnoughFriends: GenericPalletError<Rv>;
+    NotEnoughFriends: GenericPalletError;
 
     /**
      * Friends list must be less than max friends
      **/
-    MaxFriends: GenericPalletError<Rv>;
+    MaxFriends: GenericPalletError;
 
     /**
      * Friends list must be sorted and free of duplicates
      **/
-    NotSorted: GenericPalletError<Rv>;
+    NotSorted: GenericPalletError;
 
     /**
      * This account is not set up for recovery
      **/
-    NotRecoverable: GenericPalletError<Rv>;
+    NotRecoverable: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyRecoverable: GenericPalletError<Rv>;
+    AlreadyRecoverable: GenericPalletError;
 
     /**
      * A recovery process has already started for this account
      **/
-    AlreadyStarted: GenericPalletError<Rv>;
+    AlreadyStarted: GenericPalletError;
 
     /**
      * A recovery process has not started for this rescuer
      **/
-    NotStarted: GenericPalletError<Rv>;
+    NotStarted: GenericPalletError;
 
     /**
      * This account is not a friend who can vouch
      **/
-    NotFriend: GenericPalletError<Rv>;
+    NotFriend: GenericPalletError;
 
     /**
      * The friend must wait until the delay period to vouch for this recovery
      **/
-    DelayPeriod: GenericPalletError<Rv>;
+    DelayPeriod: GenericPalletError;
 
     /**
      * This user has already vouched for this recovery
      **/
-    AlreadyVouched: GenericPalletError<Rv>;
+    AlreadyVouched: GenericPalletError;
 
     /**
      * The threshold for recovering this account has not been met
      **/
-    Threshold: GenericPalletError<Rv>;
+    Threshold: GenericPalletError;
 
     /**
      * There are still active recovery attempts that need to be closed
      **/
-    StillActive: GenericPalletError<Rv>;
+    StillActive: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyProxy: GenericPalletError<Rv>;
+    AlreadyProxy: GenericPalletError;
 
     /**
      * Some internal state is broken.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -1172,33 +1172,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -1207,32 +1207,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -1241,47 +1241,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -1290,78 +1290,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -1370,47 +1370,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -1419,68 +1419,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -1489,22 +1489,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -1513,82 +1513,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -1597,17 +1597,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -1616,44 +1616,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -1662,160 +1662,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -1826,37 +1826,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -1865,17 +1865,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -1884,52 +1884,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StakingAhClient`'s errors
@@ -1938,12 +1938,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Could not process incoming message because incoming messages are blocked.
      **/
-    Blocked: GenericPalletError<Rv>;
+    Blocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Configuration`'s errors
@@ -1952,12 +1952,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The new value for a configuration parameter is invalid.
      **/
-    InvalidNewValue: GenericPalletError<Rv>;
+    InvalidNewValue: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInclusion`'s errors
@@ -1966,95 +1966,95 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Validator index out of bounds.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Candidate submitted but para not scheduled.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Head data exceeds the configured maximum.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Code upgrade prematurely.
      **/
-    PrematureCodeUpgrade: GenericPalletError<Rv>;
+    PrematureCodeUpgrade: GenericPalletError;
 
     /**
      * Output code is too large
      **/
-    NewCodeTooLarge: GenericPalletError<Rv>;
+    NewCodeTooLarge: GenericPalletError;
 
     /**
      * The candidate's relay-parent was not allowed. Either it was
      * not recent enough or it didn't advance based on the last parachain block.
      **/
-    DisallowedRelayParent: GenericPalletError<Rv>;
+    DisallowedRelayParent: GenericPalletError;
 
     /**
      * Failed to compute group index for the core: either it's out of bounds
      * or the relay parent doesn't belong to the current session.
      **/
-    InvalidAssignment: GenericPalletError<Rv>;
+    InvalidAssignment: GenericPalletError;
 
     /**
      * Invalid group index in core assignment.
      **/
-    InvalidGroupIndex: GenericPalletError<Rv>;
+    InvalidGroupIndex: GenericPalletError;
 
     /**
      * Insufficient (non-majority) backing.
      **/
-    InsufficientBacking: GenericPalletError<Rv>;
+    InsufficientBacking: GenericPalletError;
 
     /**
      * Invalid (bad signature, unknown validator, etc.) backing.
      **/
-    InvalidBacking: GenericPalletError<Rv>;
+    InvalidBacking: GenericPalletError;
 
     /**
      * The validation data hash does not match expected.
      **/
-    ValidationDataHashMismatch: GenericPalletError<Rv>;
+    ValidationDataHashMismatch: GenericPalletError;
 
     /**
      * The downward message queue is not processed correctly.
      **/
-    IncorrectDownwardMessageHandling: GenericPalletError<Rv>;
+    IncorrectDownwardMessageHandling: GenericPalletError;
 
     /**
      * At least one upward message sent does not pass the acceptance criteria.
      **/
-    InvalidUpwardMessages: GenericPalletError<Rv>;
+    InvalidUpwardMessages: GenericPalletError;
 
     /**
      * The candidate didn't follow the rules of HRMP watermark advancement.
      **/
-    HrmpWatermarkMishandling: GenericPalletError<Rv>;
+    HrmpWatermarkMishandling: GenericPalletError;
 
     /**
      * The HRMP messages sent by the candidate is not valid.
      **/
-    InvalidOutboundHrmp: GenericPalletError<Rv>;
+    InvalidOutboundHrmp: GenericPalletError;
 
     /**
      * The validation code hash of the candidate is not valid.
      **/
-    InvalidValidationCodeHash: GenericPalletError<Rv>;
+    InvalidValidationCodeHash: GenericPalletError;
 
     /**
      * The `para_head` hash in the candidate descriptor doesn't match the hash of the actual
      * para head in the commitments.
      **/
-    ParaHeadMismatch: GenericPalletError<Rv>;
+    ParaHeadMismatch: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInherent`'s errors
@@ -2063,29 +2063,29 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Inclusion inherent called more than once per block.
      **/
-    TooManyInclusionInherents: GenericPalletError<Rv>;
+    TooManyInclusionInherents: GenericPalletError;
 
     /**
      * The hash of the submitted parent header doesn't correspond to the saved block hash of
      * the parent.
      **/
-    InvalidParentHeader: GenericPalletError<Rv>;
+    InvalidParentHeader: GenericPalletError;
 
     /**
      * Inherent data was filtered during execution. This should have only been done
      * during creation.
      **/
-    InherentDataFilteredDuringExecution: GenericPalletError<Rv>;
+    InherentDataFilteredDuringExecution: GenericPalletError;
 
     /**
      * Too many candidates supplied.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Paras`'s errors
@@ -2094,87 +2094,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Para is not registered in our system.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Para cannot be onboarded because it is already tracked by our system.
      **/
-    CannotOnboard: GenericPalletError<Rv>;
+    CannotOnboard: GenericPalletError;
 
     /**
      * Para cannot be offboarded at this time.
      **/
-    CannotOffboard: GenericPalletError<Rv>;
+    CannotOffboard: GenericPalletError;
 
     /**
      * Para cannot be upgraded to a lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para cannot be downgraded to an on-demand parachain.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is stale.
      **/
-    PvfCheckStatementStale: GenericPalletError<Rv>;
+    PvfCheckStatementStale: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is for a future session.
      **/
-    PvfCheckStatementFuture: GenericPalletError<Rv>;
+    PvfCheckStatementFuture: GenericPalletError;
 
     /**
      * Claimed validator index is out of bounds.
      **/
-    PvfCheckValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    PvfCheckValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * The signature for the PVF pre-checking is invalid.
      **/
-    PvfCheckInvalidSignature: GenericPalletError<Rv>;
+    PvfCheckInvalidSignature: GenericPalletError;
 
     /**
      * The given validator already has cast a vote.
      **/
-    PvfCheckDoubleVote: GenericPalletError<Rv>;
+    PvfCheckDoubleVote: GenericPalletError;
 
     /**
      * The given PVF does not exist at the moment of process a vote.
      **/
-    PvfCheckSubjectInvalid: GenericPalletError<Rv>;
+    PvfCheckSubjectInvalid: GenericPalletError;
 
     /**
      * Parachain cannot currently schedule a code upgrade.
      **/
-    CannotUpgradeCode: GenericPalletError<Rv>;
+    CannotUpgradeCode: GenericPalletError;
 
     /**
      * Invalid validation code size.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Invalid block number.
      **/
-    InvalidBlockNumber: GenericPalletError<Rv>;
+    InvalidBlockNumber: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Hrmp`'s errors
@@ -2183,107 +2183,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The sender tried to open a channel to themselves.
      **/
-    OpenHrmpChannelToSelf: GenericPalletError<Rv>;
+    OpenHrmpChannelToSelf: GenericPalletError;
 
     /**
      * The recipient is not a valid para.
      **/
-    OpenHrmpChannelInvalidRecipient: GenericPalletError<Rv>;
+    OpenHrmpChannelInvalidRecipient: GenericPalletError;
 
     /**
      * The requested capacity is zero.
      **/
-    OpenHrmpChannelZeroCapacity: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroCapacity: GenericPalletError;
 
     /**
      * The requested capacity exceeds the global limit.
      **/
-    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError;
 
     /**
      * The requested maximum message size is 0.
      **/
-    OpenHrmpChannelZeroMessageSize: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroMessageSize: GenericPalletError;
 
     /**
      * The open request requested the message size that exceeds the global limit.
      **/
-    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError;
 
     /**
      * The channel already exists
      **/
-    OpenHrmpChannelAlreadyExists: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyExists: GenericPalletError;
 
     /**
      * There is already a request to open the same channel.
      **/
-    OpenHrmpChannelAlreadyRequested: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyRequested: GenericPalletError;
 
     /**
      * The sender already has the maximum number of allowed outbound channels.
      **/
-    OpenHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    OpenHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The channel from the sender to the origin doesn't exist.
      **/
-    AcceptHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    AcceptHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel is already confirmed.
      **/
-    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The recipient already has the maximum number of allowed inbound channels.
      **/
-    AcceptHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    AcceptHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The origin tries to close a channel where it is neither the sender nor the recipient.
      **/
-    CloseHrmpChannelUnauthorized: GenericPalletError<Rv>;
+    CloseHrmpChannelUnauthorized: GenericPalletError;
 
     /**
      * The channel to be closed doesn't exist.
      **/
-    CloseHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    CloseHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel close request is already requested.
      **/
-    CloseHrmpChannelAlreadyUnderway: GenericPalletError<Rv>;
+    CloseHrmpChannelAlreadyUnderway: GenericPalletError;
 
     /**
      * Canceling is requested by neither the sender nor recipient of the open channel request.
      **/
-    CancelHrmpOpenChannelUnauthorized: GenericPalletError<Rv>;
+    CancelHrmpOpenChannelUnauthorized: GenericPalletError;
 
     /**
      * The open request doesn't exist.
      **/
-    OpenHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    OpenHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * Cannot cancel an HRMP open channel request because it is already confirmed.
      **/
-    OpenHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The provided witness data is wrong.
      **/
-    WrongWitness: GenericPalletError<Rv>;
+    WrongWitness: GenericPalletError;
 
     /**
      * The channel between these two chains cannot be authorized.
      **/
-    ChannelCreationNotAuthorized: GenericPalletError<Rv>;
+    ChannelCreationNotAuthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasDisputes`'s errors
@@ -2292,52 +2292,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Duplicate dispute statement sets provided.
      **/
-    DuplicateDisputeStatementSets: GenericPalletError<Rv>;
+    DuplicateDisputeStatementSets: GenericPalletError;
 
     /**
      * Ancient dispute statement provided.
      **/
-    AncientDisputeStatement: GenericPalletError<Rv>;
+    AncientDisputeStatement: GenericPalletError;
 
     /**
      * Validator index on statement is out of bounds for session.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Invalid signature on statement.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Validator vote submitted more than once to dispute.
      **/
-    DuplicateStatement: GenericPalletError<Rv>;
+    DuplicateStatement: GenericPalletError;
 
     /**
      * A dispute where there are only votes on one side.
      **/
-    SingleSidedDispute: GenericPalletError<Rv>;
+    SingleSidedDispute: GenericPalletError;
 
     /**
      * A dispute vote from a malicious backer.
      **/
-    MaliciousBacker: GenericPalletError<Rv>;
+    MaliciousBacker: GenericPalletError;
 
     /**
      * No backing votes were provides along dispute statements.
      **/
-    MissingBackingVotes: GenericPalletError<Rv>;
+    MissingBackingVotes: GenericPalletError;
 
     /**
      * Unconfirmed dispute statement sets provided.
      **/
-    UnconfirmedDispute: GenericPalletError<Rv>;
+    UnconfirmedDispute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasSlashing`'s errors
@@ -2346,38 +2346,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The key ownership proof is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * The session index is too old or invalid.
      **/
-    InvalidSessionIndex: GenericPalletError<Rv>;
+    InvalidSessionIndex: GenericPalletError;
 
     /**
      * The candidate hash is invalid.
      **/
-    InvalidCandidateHash: GenericPalletError<Rv>;
+    InvalidCandidateHash: GenericPalletError;
 
     /**
      * There is no pending slash for the given validator index and time
      * slot.
      **/
-    InvalidValidatorIndex: GenericPalletError<Rv>;
+    InvalidValidatorIndex: GenericPalletError;
 
     /**
      * The validator index does not match the validator id.
      **/
-    ValidatorIndexIdMismatch: GenericPalletError<Rv>;
+    ValidatorIndexIdMismatch: GenericPalletError;
 
     /**
      * The given slashing report is valid but already previously reported.
      **/
-    DuplicateSlashingReport: GenericPalletError<Rv>;
+    DuplicateSlashingReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s errors
@@ -2386,40 +2386,40 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The order queue is full, `place_order` will not continue.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The current spot price is higher than the max amount specified in the `place_order`
      * call, making it invalid.
      **/
-    SpotPriceHigherThanMaxAmount: GenericPalletError<Rv>;
+    SpotPriceHigherThanMaxAmount: GenericPalletError;
 
     /**
      * The account doesn't have enough credits to purchase on-demand coretime.
      **/
-    InsufficientCredits: GenericPalletError<Rv>;
+    InsufficientCredits: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s errors
    **/
   coretimeAssignmentProvider: {
-    AssignmentsEmpty: GenericPalletError<Rv>;
+    AssignmentsEmpty: GenericPalletError;
 
     /**
      * assign_core is only allowed to append new assignments at the end of already existing
      * ones or update the last entry.
      **/
-    DisallowedInsert: GenericPalletError<Rv>;
+    DisallowedInsert: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Registrar`'s errors
@@ -2428,79 +2428,79 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The ID is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * The ID is already registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * The caller is not the owner of this Id.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Invalid para code size.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * Invalid para head data size.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Para is not a Parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Para is not a Parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Cannot deregister para
      **/
-    CannotDeregister: GenericPalletError<Rv>;
+    CannotDeregister: GenericPalletError;
 
     /**
      * Cannot schedule downgrade of lease holding parachain to on-demand parachain
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * Cannot schedule upgrade of on-demand parachain to lease holding parachain
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para is locked from manipulation by the manager. Must use parachain or relay chain
      * governance.
      **/
-    ParaLocked: GenericPalletError<Rv>;
+    ParaLocked: GenericPalletError;
 
     /**
      * The ID given for registration has not been reserved.
      **/
-    NotReserved: GenericPalletError<Rv>;
+    NotReserved: GenericPalletError;
 
     /**
      * The validation code is invalid.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Cannot perform a parachain slot / lifecycle swap. Check that the state of both paras
      * are correct for the swap to work.
      **/
-    CannotSwap: GenericPalletError<Rv>;
+    CannotSwap: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Slots`'s errors
@@ -2509,17 +2509,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parachain ID is not onboarding.
      **/
-    ParaNotOnboarding: GenericPalletError<Rv>;
+    ParaNotOnboarding: GenericPalletError;
 
     /**
      * There was an error with the lease.
      **/
-    LeaseError: GenericPalletError<Rv>;
+    LeaseError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Auctions`'s errors
@@ -2528,42 +2528,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * This auction is already in progress.
      **/
-    AuctionInProgress: GenericPalletError<Rv>;
+    AuctionInProgress: GenericPalletError;
 
     /**
      * The lease period is in the past.
      **/
-    LeasePeriodInPast: GenericPalletError<Rv>;
+    LeasePeriodInPast: GenericPalletError;
 
     /**
      * Para is not registered
      **/
-    ParaNotRegistered: GenericPalletError<Rv>;
+    ParaNotRegistered: GenericPalletError;
 
     /**
      * Not a current auction.
      **/
-    NotCurrentAuction: GenericPalletError<Rv>;
+    NotCurrentAuction: GenericPalletError;
 
     /**
      * Not an auction.
      **/
-    NotAuction: GenericPalletError<Rv>;
+    NotAuction: GenericPalletError;
 
     /**
      * Auction has already ended.
      **/
-    AuctionEnded: GenericPalletError<Rv>;
+    AuctionEnded: GenericPalletError;
 
     /**
      * The para is already leased out for part of this range.
      **/
-    AlreadyLeasedOut: GenericPalletError<Rv>;
+    AlreadyLeasedOut: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Crowdloan`'s errors
@@ -2572,123 +2572,123 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The current lease period is more than the first lease period.
      **/
-    FirstPeriodInPast: GenericPalletError<Rv>;
+    FirstPeriodInPast: GenericPalletError;
 
     /**
      * The first lease period needs to at least be less than 3 `max_value`.
      **/
-    FirstPeriodTooFarInFuture: GenericPalletError<Rv>;
+    FirstPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * Last lease period must be greater than first lease period.
      **/
-    LastPeriodBeforeFirstPeriod: GenericPalletError<Rv>;
+    LastPeriodBeforeFirstPeriod: GenericPalletError;
 
     /**
      * The last lease period cannot be more than 3 periods after the first period.
      **/
-    LastPeriodTooFarInFuture: GenericPalletError<Rv>;
+    LastPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * The campaign ends before the current block number. The end must be in the future.
      **/
-    CannotEndInPast: GenericPalletError<Rv>;
+    CannotEndInPast: GenericPalletError;
 
     /**
      * The end date for this crowdloan is not sensible.
      **/
-    EndTooFarInFuture: GenericPalletError<Rv>;
+    EndTooFarInFuture: GenericPalletError;
 
     /**
      * There was an overflow.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The contribution was below the minimum, `MinContribution`.
      **/
-    ContributionTooSmall: GenericPalletError<Rv>;
+    ContributionTooSmall: GenericPalletError;
 
     /**
      * Invalid fund index.
      **/
-    InvalidParaId: GenericPalletError<Rv>;
+    InvalidParaId: GenericPalletError;
 
     /**
      * Contributions exceed maximum amount.
      **/
-    CapExceeded: GenericPalletError<Rv>;
+    CapExceeded: GenericPalletError;
 
     /**
      * The contribution period has already ended.
      **/
-    ContributionPeriodOver: GenericPalletError<Rv>;
+    ContributionPeriodOver: GenericPalletError;
 
     /**
      * The origin of this call is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * This crowdloan does not correspond to a parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * This parachain lease is still active and retirement cannot yet begin.
      **/
-    LeaseActive: GenericPalletError<Rv>;
+    LeaseActive: GenericPalletError;
 
     /**
      * This parachain's bid or lease is still active and withdraw cannot yet begin.
      **/
-    BidOrLeaseActive: GenericPalletError<Rv>;
+    BidOrLeaseActive: GenericPalletError;
 
     /**
      * The crowdloan has not yet ended.
      **/
-    FundNotEnded: GenericPalletError<Rv>;
+    FundNotEnded: GenericPalletError;
 
     /**
      * There are no contributions stored in this crowdloan.
      **/
-    NoContributions: GenericPalletError<Rv>;
+    NoContributions: GenericPalletError;
 
     /**
      * The crowdloan is not ready to dissolve. Potentially still has a slot or in retirement
      * period.
      **/
-    NotReadyToDissolve: GenericPalletError<Rv>;
+    NotReadyToDissolve: GenericPalletError;
 
     /**
      * Invalid signature.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * The provided memo is too large.
      **/
-    MemoTooLarge: GenericPalletError<Rv>;
+    MemoTooLarge: GenericPalletError;
 
     /**
      * The fund is already in `NewRaise`
      **/
-    AlreadyInNewRaise: GenericPalletError<Rv>;
+    AlreadyInNewRaise: GenericPalletError;
 
     /**
      * No contributions allowed during the VRF delay
      **/
-    VrfDelayInProgress: GenericPalletError<Rv>;
+    VrfDelayInProgress: GenericPalletError;
 
     /**
      * A lease period has not started yet, due to an offset in the starting block.
      **/
-    NoLeasePeriod: GenericPalletError<Rv>;
+    NoLeasePeriod: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Coretime`'s errors
@@ -2697,23 +2697,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The paraid making the call is not the coretime brokerage system parachain.
      **/
-    NotBroker: GenericPalletError<Rv>;
+    NotBroker: GenericPalletError;
 
     /**
      * Requested revenue information `when` parameter was in the future from the current
      * block height.
      **/
-    RequestedFutureRevenue: GenericPalletError<Rv>;
+    RequestedFutureRevenue: GenericPalletError;
 
     /**
      * Failed to transfer assets to the coretime chain
      **/
-    AssetTransferFailed: GenericPalletError<Rv>;
+    AssetTransferFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmPallet`'s errors
@@ -2723,152 +2723,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -2878,32 +2878,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -2911,24 +2911,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2937,22 +2937,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Beefy`'s errors
@@ -2961,135 +2961,135 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A double voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidDoubleVotingProof: GenericPalletError<Rv>;
+    InvalidDoubleVotingProof: GenericPalletError;
 
     /**
      * A fork voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidForkVotingProof: GenericPalletError<Rv>;
+    InvalidForkVotingProof: GenericPalletError;
 
     /**
      * A future block voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidFutureBlockVotingProof: GenericPalletError<Rv>;
+    InvalidFutureBlockVotingProof: GenericPalletError;
 
     /**
      * The session of the equivocation proof is invalid
      **/
-    InvalidEquivocationProofSession: GenericPalletError<Rv>;
+    InvalidEquivocationProofSession: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RcMigrator`'s errors
    **/
   rcMigrator: {
-    Unreachable: GenericPalletError<Rv>;
-    OutOfWeight: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
+    OutOfWeight: GenericPalletError;
 
     /**
      * Failed to send XCM message to AH.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to withdraw account from RC for migration to AH.
      **/
-    FailedToWithdrawAccount: GenericPalletError<Rv>;
+    FailedToWithdrawAccount: GenericPalletError;
 
     /**
      * Indicates that the specified block number is in the past.
      **/
-    PastBlockNumber: GenericPalletError<Rv>;
+    PastBlockNumber: GenericPalletError;
 
     /**
      * Indicates that there is not enough time for staking to lock.
      *
      * Schedule the migration at least two sessions before the current era ends.
      **/
-    EraEndsTooSoon: GenericPalletError<Rv>;
+    EraEndsTooSoon: GenericPalletError;
 
     /**
      * Balance accounting overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Balance accounting underflow.
      **/
-    BalanceUnderflow: GenericPalletError<Rv>;
+    BalanceUnderflow: GenericPalletError;
 
     /**
      * The query response is invalid.
      **/
-    InvalidQueryResponse: GenericPalletError<Rv>;
+    InvalidQueryResponse: GenericPalletError;
 
     /**
      * The xcm query was not found.
      **/
-    QueryNotFound: GenericPalletError<Rv>;
+    QueryNotFound: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmSendError: GenericPalletError<Rv>;
+    XcmSendError: GenericPalletError;
 
     /**
      * The migration stage is not reachable from the current stage.
      **/
-    UnreachableStage: GenericPalletError<Rv>;
+    UnreachableStage: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * The AH UMP queue priority configuration is already set.
      **/
-    AhUmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    AhUmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * The account is referenced by some other pallet. It might have freezes or holds.
      **/
-    AccountReferenced: GenericPalletError<Rv>;
+    AccountReferenced: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The stage transition is invalid.
      **/
-    InvalidStageTransition: GenericPalletError<Rv>;
+    InvalidStageTransition: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/kusama/events.d.ts b/packages/chaintypes/src/kusama/events.d.ts
index c0a043bc..ff628168 100644
--- a/packages/chaintypes/src/kusama/events.d.ts
+++ b/packages/chaintypes/src/kusama/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -70,7 +70,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -78,18 +78,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -98,33 +92,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -133,7 +126,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -142,23 +135,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -167,7 +159,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -176,40 +168,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -218,87 +209,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -309,7 +300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -318,7 +308,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -328,18 +318,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -348,14 +332,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -365,17 +348,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -383,39 +361,38 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -425,7 +402,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -434,38 +410,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -476,12 +447,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Historical`'s events
@@ -490,17 +461,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The merkle root of the validators of the said session were stored
      **/
-    RootStored: GenericPalletEvent<Rv, 'Historical', 'RootStored', { index: number }>;
+    RootStored: GenericPalletEvent<'Historical', 'RootStored', { index: number }>;
 
     /**
      * The merkle roots of up to this session index were pruned
      **/
-    RootsPruned: GenericPalletEvent<Rv, 'Historical', 'RootsPruned', { upTo: number }>;
+    RootsPruned: GenericPalletEvent<'Historical', 'RootsPruned', { upTo: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -510,28 +481,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -541,7 +512,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -550,17 +520,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -569,38 +539,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -609,18 +573,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -636,28 +594,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -666,18 +624,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -687,7 +644,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -696,12 +652,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -711,7 +667,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -736,7 +691,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -761,7 +715,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -786,7 +739,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -806,7 +758,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -832,7 +783,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -843,7 +793,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -858,7 +807,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -878,7 +826,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -893,7 +840,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -913,7 +859,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -933,7 +878,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -953,7 +897,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -973,7 +916,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -998,7 +940,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1018,7 +959,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1037,7 +977,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FellowshipCollective`'s events
@@ -1046,24 +986,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A member `who` has been added.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'FellowshipCollective', 'MemberAdded', { who: AccountId32 }>;
+    MemberAdded: GenericPalletEvent<'FellowshipCollective', 'MemberAdded', { who: AccountId32 }>;
 
     /**
      * The member `who`se rank has been changed to the given `rank`.
      **/
-    RankChanged: GenericPalletEvent<Rv, 'FellowshipCollective', 'RankChanged', { who: AccountId32; rank: number }>;
+    RankChanged: GenericPalletEvent<'FellowshipCollective', 'RankChanged', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` of given `rank` has been removed from the collective.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'FellowshipCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
+    MemberRemoved: GenericPalletEvent<'FellowshipCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` has voted for the `poll` with the given `vote` leading to an updated
      * `tally`.
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'FellowshipCollective',
       'Voted',
       { who: AccountId32; poll: number; vote: PalletRankedCollectiveVoteRecord; tally: PalletRankedCollectiveTally }
@@ -1073,7 +1012,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The member `who` had their `AccountId` changed to `new_who`.
      **/
     MemberExchanged: GenericPalletEvent<
-      Rv,
       'FellowshipCollective',
       'MemberExchanged',
       { who: AccountId32; newWho: AccountId32 }
@@ -1082,7 +1020,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FellowshipReferenda`'s events
@@ -1092,7 +1030,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Submitted',
       {
@@ -1117,7 +1054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionDepositPlaced',
       {
@@ -1142,7 +1078,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionDepositRefunded',
       {
@@ -1167,7 +1102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DepositSlashed',
       {
@@ -1187,7 +1121,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionStarted',
       {
@@ -1213,7 +1146,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'ConfirmStarted',
       {
@@ -1224,7 +1156,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'ConfirmAborted',
       {
@@ -1239,7 +1170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Confirmed',
       {
@@ -1259,7 +1189,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Approved',
       {
@@ -1274,7 +1203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Rejected',
       {
@@ -1294,7 +1222,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'TimedOut',
       {
@@ -1314,7 +1241,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Cancelled',
       {
@@ -1334,7 +1260,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Killed',
       {
@@ -1354,7 +1279,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'SubmissionDepositRefunded',
       {
@@ -1379,7 +1303,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'MetadataSet',
       {
@@ -1399,7 +1322,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'MetadataCleared',
       {
@@ -1418,16 +1340,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1436,7 +1357,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -1448,7 +1369,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -1472,7 +1392,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -1482,7 +1402,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -1491,7 +1410,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1501,47 +1420,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Society`'s events
@@ -1550,51 +1469,45 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The society is founded by the given identity.
      **/
-    Founded: GenericPalletEvent<Rv, 'Society', 'Founded', { founder: AccountId32 }>;
+    Founded: GenericPalletEvent<'Society', 'Founded', { founder: AccountId32 }>;
 
     /**
      * A membership bid just happened. The given account is the candidate's ID and their offer
      * is the second.
      **/
-    Bid: GenericPalletEvent<Rv, 'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
+    Bid: GenericPalletEvent<'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
 
     /**
      * A membership bid just happened by vouching. The given account is the candidate's ID and
      * their offer is the second. The vouching party is the third.
      **/
-    Vouch: GenericPalletEvent<
-      Rv,
-      'Society',
-      'Vouch',
-      { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }
-    >;
+    Vouch: GenericPalletEvent<'Society', 'Vouch', { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }>;
 
     /**
      * A candidate was dropped (due to an excess of bids in the system).
      **/
-    AutoUnbid: GenericPalletEvent<Rv, 'Society', 'AutoUnbid', { candidate: AccountId32 }>;
+    AutoUnbid: GenericPalletEvent<'Society', 'AutoUnbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by their request).
      **/
-    Unbid: GenericPalletEvent<Rv, 'Society', 'Unbid', { candidate: AccountId32 }>;
+    Unbid: GenericPalletEvent<'Society', 'Unbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by request of who vouched for them).
      **/
-    Unvouch: GenericPalletEvent<Rv, 'Society', 'Unvouch', { candidate: AccountId32 }>;
+    Unvouch: GenericPalletEvent<'Society', 'Unvouch', { candidate: AccountId32 }>;
 
     /**
      * A group of candidates have been inducted. The batch's primary is the first value, the
      * batch in full is the second.
      **/
-    Inducted: GenericPalletEvent<Rv, 'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
+    Inducted: GenericPalletEvent<'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
 
     /**
      * A suspended member has been judged.
      **/
     SuspendedMemberJudgement: GenericPalletEvent<
-      Rv,
       'Society',
       'SuspendedMemberJudgement',
       { who: AccountId32; judged: boolean }
@@ -1603,53 +1516,52 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate has been suspended
      **/
-    CandidateSuspended: GenericPalletEvent<Rv, 'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
+    CandidateSuspended: GenericPalletEvent<'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
 
     /**
      * A member has been suspended
      **/
-    MemberSuspended: GenericPalletEvent<Rv, 'Society', 'MemberSuspended', { member: AccountId32 }>;
+    MemberSuspended: GenericPalletEvent<'Society', 'MemberSuspended', { member: AccountId32 }>;
 
     /**
      * A member has been challenged
      **/
-    Challenged: GenericPalletEvent<Rv, 'Society', 'Challenged', { member: AccountId32 }>;
+    Challenged: GenericPalletEvent<'Society', 'Challenged', { member: AccountId32 }>;
 
     /**
      * A vote has been placed
      **/
-    Vote: GenericPalletEvent<Rv, 'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
+    Vote: GenericPalletEvent<'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
 
     /**
      * A vote has been placed for a defending member
      **/
-    DefenderVote: GenericPalletEvent<Rv, 'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
+    DefenderVote: GenericPalletEvent<'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
 
     /**
      * A new set of \[params\] has been set for the group.
      **/
-    NewParams: GenericPalletEvent<Rv, 'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
+    NewParams: GenericPalletEvent<'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
 
     /**
      * Society is unfounded.
      **/
-    Unfounded: GenericPalletEvent<Rv, 'Society', 'Unfounded', { founder: AccountId32 }>;
+    Unfounded: GenericPalletEvent<'Society', 'Unfounded', { founder: AccountId32 }>;
 
     /**
      * Some funds were deposited into the society account.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Society', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Society', 'Deposit', { value: bigint }>;
 
     /**
      * A \[member\] got elevated to \[rank\].
      **/
-    Elevated: GenericPalletEvent<Rv, 'Society', 'Elevated', { member: AccountId32; rank: number }>;
+    Elevated: GenericPalletEvent<'Society', 'Elevated', { member: AccountId32; rank: number }>;
 
     /**
      * A deposit was poked / adjusted.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Society',
       'DepositPoked',
       { who: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -1658,7 +1570,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Recovery`'s events
@@ -1667,13 +1579,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been set up for an account.
      **/
-    RecoveryCreated: GenericPalletEvent<Rv, 'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
+    RecoveryCreated: GenericPalletEvent<'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
 
     /**
      * A recovery process has been initiated for lost account by rescuer account.
      **/
     RecoveryInitiated: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryInitiated',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1683,7 +1594,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been vouched for by sender.
      **/
     RecoveryVouched: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryVouched',
       { lostAccount: AccountId32; rescuerAccount: AccountId32; sender: AccountId32 }
@@ -1693,7 +1603,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been closed.
      **/
     RecoveryClosed: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryClosed',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1703,7 +1612,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Lost account has been successfully recovered by rescuer account.
      **/
     AccountRecovered: GenericPalletEvent<
-      Rv,
       'Recovery',
       'AccountRecovered',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1712,13 +1620,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been removed for an account.
      **/
-    RecoveryRemoved: GenericPalletEvent<Rv, 'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
+    RecoveryRemoved: GenericPalletEvent<'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
 
     /**
      * A deposit has been updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Recovery',
       'DepositPoked',
       { who: AccountId32; kind: PalletRecoveryDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1727,7 +1634,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -1736,28 +1643,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -1766,18 +1668,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -1787,7 +1688,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1797,7 +1697,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1807,7 +1706,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1817,7 +1715,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1828,7 +1725,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1838,7 +1734,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1847,12 +1742,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1861,14 +1756,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1883,7 +1777,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1897,13 +1790,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: KusamaRuntimeConstantsProxyProxyType; delay: number }
@@ -1913,7 +1805,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: KusamaRuntimeConstantsProxyProxyType; delay: number }
@@ -1923,7 +1814,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1932,7 +1822,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1942,7 +1832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1952,7 +1841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1962,7 +1850,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1978,7 +1865,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1988,7 +1874,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1997,7 +1882,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -2006,22 +1891,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -2030,28 +1915,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -2060,38 +1944,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -2100,7 +1983,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -2109,13 +1992,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -2125,7 +2007,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -2134,12 +2015,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -2155,7 +2036,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -2169,7 +2049,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -2180,23 +2059,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -2205,7 +2083,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -2214,17 +2092,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -2233,13 +2111,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -2248,12 +2125,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -2269,7 +2141,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -2284,7 +2155,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -2293,13 +2163,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -2313,7 +2182,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -2324,7 +2192,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -2333,13 +2200,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -2349,7 +2215,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -2359,7 +2224,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -2369,7 +2233,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -2379,7 +2242,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -2389,7 +2251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -2399,7 +2260,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -2409,7 +2269,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -2419,7 +2278,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -2428,19 +2286,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -2450,7 +2302,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -2460,7 +2311,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -2476,7 +2326,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -2485,22 +2335,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -2508,17 +2353,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -2528,7 +2373,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2538,7 +2382,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2548,7 +2391,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2558,7 +2400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2567,7 +2408,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingAhClient`'s events
@@ -2577,7 +2418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new validator set has been received.
      **/
     ValidatorSetReceived: GenericPalletEvent<
-      Rv,
       'StakingAhClient',
       'ValidatorSetReceived',
       { id: number; newValidatorSetCount: number; pruneUpTo?: number | undefined; leftover: boolean }
@@ -2589,24 +2429,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Note that this event is more resembling an error, but we use an event because in this
      * pallet we need to mutate storage upon some failures.
      **/
-    CouldNotMergeAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'CouldNotMergeAndDropped', null>;
+    CouldNotMergeAndDropped: GenericPalletEvent<'StakingAhClient', 'CouldNotMergeAndDropped', null>;
 
     /**
      * The validator set received is way too small, as per
      * [`Config::MinimumValidatorSetSize`].
      **/
-    SetTooSmallAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'SetTooSmallAndDropped', null>;
+    SetTooSmallAndDropped: GenericPalletEvent<'StakingAhClient', 'SetTooSmallAndDropped', null>;
 
     /**
      * Something occurred that should never happen under normal operation. Logged as an event
      * for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParaInclusion`'s events
@@ -2616,7 +2456,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was backed. `[candidate, head_data]`
      **/
     CandidateBacked: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateBacked',
       [
@@ -2631,7 +2470,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was included. `[candidate, head_data]`
      **/
     CandidateIncluded: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateIncluded',
       [
@@ -2646,7 +2484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate timed out. `[candidate, head_data]`
      **/
     CandidateTimedOut: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateTimedOut',
       [
@@ -2660,7 +2497,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some upward messages have been received and will be processed.
      **/
     UpwardMessagesReceived: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'UpwardMessagesReceived',
       { from: PolkadotParachainPrimitivesPrimitivesId; count: number }
@@ -2669,7 +2505,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Paras`'s events
@@ -2678,39 +2514,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current code has been updated for a Para. `para_id`
      **/
-    CurrentCodeUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentCodeUpdated: GenericPalletEvent<'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Current head has been updated for a Para. `para_id`
      **/
-    CurrentHeadUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentHeadUpdated: GenericPalletEvent<'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A code upgrade has been scheduled for a Para. `para_id`
      **/
-    CodeUpgradeScheduled: GenericPalletEvent<
-      Rv,
-      'Paras',
-      'CodeUpgradeScheduled',
-      PolkadotParachainPrimitivesPrimitivesId
-    >;
+    CodeUpgradeScheduled: GenericPalletEvent<'Paras', 'CodeUpgradeScheduled', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A new head has been noted for a Para. `para_id`
      **/
-    NewHeadNoted: GenericPalletEvent<Rv, 'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
+    NewHeadNoted: GenericPalletEvent<'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A para has been queued to execute pending actions. `para_id`
      **/
-    ActionQueued: GenericPalletEvent<Rv, 'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
+    ActionQueued: GenericPalletEvent<'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
 
     /**
      * The given para either initiated or subscribed to a PVF check for the given validation
      * code. `code_hash` `para_id`
      **/
     PvfCheckStarted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckStarted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2721,7 +2551,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckAccepted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckAccepted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2732,7 +2561,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckRejected: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckRejected',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2742,7 +2570,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The upgrade cooldown was removed.
      **/
     UpgradeCooldownRemoved: GenericPalletEvent<
-      Rv,
       'Paras',
       'UpgradeCooldownRemoved',
       {
@@ -2757,7 +2584,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new code hash has been authorized for a Para.
      **/
     CodeAuthorized: GenericPalletEvent<
-      Rv,
       'Paras',
       'CodeAuthorized',
       {
@@ -2781,7 +2607,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Hrmp`'s events
@@ -2791,7 +2617,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel requested.
      **/
     OpenChannelRequested: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelRequested',
       {
@@ -2806,7 +2631,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel request sent by the receiver was canceled by either party.
      **/
     OpenChannelCanceled: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelCanceled',
       {
@@ -2819,7 +2643,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel accepted.
      **/
     OpenChannelAccepted: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelAccepted',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2829,7 +2652,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * HRMP channel closed.
      **/
     ChannelClosed: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'ChannelClosed',
       {
@@ -2842,7 +2664,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened via Root origin.
      **/
     HrmpChannelForceOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpChannelForceOpened',
       {
@@ -2857,7 +2678,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened with a system chain.
      **/
     HrmpSystemChannelOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpSystemChannelOpened',
       {
@@ -2872,7 +2692,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel's deposits were updated.
      **/
     OpenChannelDepositsUpdated: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelDepositsUpdated',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2881,7 +2700,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParasDisputes`'s events
@@ -2891,7 +2710,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A dispute has been initiated. \[candidate hash, dispute location\]
      **/
     DisputeInitiated: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeInitiated',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeLocation]
@@ -2902,7 +2720,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `\[para id, candidate hash, dispute result\]`
      **/
     DisputeConcluded: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeConcluded',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeResult]
@@ -2914,12 +2731,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * instead revert the block at the given height. This should be the
      * number of the child of the last known valid block in the chain.
      **/
-    Revert: GenericPalletEvent<Rv, 'ParasDisputes', 'Revert', number>;
+    Revert: GenericPalletEvent<'ParasDisputes', 'Revert', number>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s events
@@ -2929,7 +2746,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An order was placed at some spot price amount by orderer ordered_by
      **/
     OnDemandOrderPlaced: GenericPalletEvent<
-      Rv,
       'OnDemandAssignmentProvider',
       'OnDemandOrderPlaced',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; spotPrice: bigint; orderedBy: AccountId32 }
@@ -2938,13 +2754,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The value of the spot price has likely changed
      **/
-    SpotPriceSet: GenericPalletEvent<Rv, 'OnDemandAssignmentProvider', 'SpotPriceSet', { spotPrice: bigint }>;
+    SpotPriceSet: GenericPalletEvent<'OnDemandAssignmentProvider', 'SpotPriceSet', { spotPrice: bigint }>;
 
     /**
      * An account was given credits.
      **/
     AccountCredited: GenericPalletEvent<
-      Rv,
       'OnDemandAssignmentProvider',
       'AccountCredited',
       { who: AccountId32; amount: bigint }
@@ -2953,32 +2768,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Registrar`'s events
    **/
   registrar: {
     Registered: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Registered',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; manager: AccountId32 }
     >;
-    Deregistered: GenericPalletEvent<
-      Rv,
-      'Registrar',
-      'Deregistered',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    Deregistered: GenericPalletEvent<'Registrar', 'Deregistered', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
     Reserved: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Reserved',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; who: AccountId32 }
     >;
     Swapped: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Swapped',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; otherId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2987,7 +2794,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Slots`'s events
@@ -2996,7 +2803,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new `[lease_period]` is beginning.
      **/
-    NewLeasePeriod: GenericPalletEvent<Rv, 'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
+    NewLeasePeriod: GenericPalletEvent<'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
 
     /**
      * A para has won the right to a continuous set of lease periods as a parachain.
@@ -3004,7 +2811,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Second balance is the total amount reserved.
      **/
     Leased: GenericPalletEvent<
-      Rv,
       'Slots',
       'Leased',
       {
@@ -3020,7 +2826,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Auctions`'s events
@@ -3031,7 +2837,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * close and the first lease period of the quadruplet that is auctioned.
      **/
     AuctionStarted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'AuctionStarted',
       { auctionIndex: number; leasePeriod: number; ending: number }
@@ -3040,14 +2845,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An auction ended. All funds become unreserved.
      **/
-    AuctionClosed: GenericPalletEvent<Rv, 'Auctions', 'AuctionClosed', { auctionIndex: number }>;
+    AuctionClosed: GenericPalletEvent<'Auctions', 'AuctionClosed', { auctionIndex: number }>;
 
     /**
      * Funds were reserved for a winning bid. First balance is the extra amount reserved.
      * Second is the total.
      **/
     Reserved: GenericPalletEvent<
-      Rv,
       'Auctions',
       'Reserved',
       { bidder: AccountId32; extraReserved: bigint; totalAmount: bigint }
@@ -3056,14 +2860,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Funds were unreserved since bidder is no longer active. `[bidder, amount]`
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
 
     /**
      * Someone attempted to lease the same slot twice for a parachain. The amount is held in
      * reserve but no parachain slot has been leased.
      **/
     ReserveConfiscated: GenericPalletEvent<
-      Rv,
       'Auctions',
       'ReserveConfiscated',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; leaser: AccountId32; amount: bigint }
@@ -3073,7 +2876,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new bid has been accepted as the current winner.
      **/
     BidAccepted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'BidAccepted',
       {
@@ -3089,12 +2891,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The winning offset was chosen for an auction. This will map into the `Winning` storage
      * map.
      **/
-    WinningOffset: GenericPalletEvent<Rv, 'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
+    WinningOffset: GenericPalletEvent<'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Crowdloan`'s events
@@ -3103,13 +2905,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Create a new crowdloaning campaign.
      **/
-    Created: GenericPalletEvent<Rv, 'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Created: GenericPalletEvent<'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Contributed to a crowd sale.
      **/
     Contributed: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Contributed',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -3119,7 +2920,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdrew full balance of a contributor.
      **/
     Withdrew: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Withdrew',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -3130,7 +2930,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * over child keys that still need to be killed.
      **/
     PartiallyRefunded: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'PartiallyRefunded',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -3139,23 +2938,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * All loans in a fund have been refunded.
      **/
-    AllRefunded: GenericPalletEvent<
-      Rv,
-      'Crowdloan',
-      'AllRefunded',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    AllRefunded: GenericPalletEvent<'Crowdloan', 'AllRefunded', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Fund is dissolved.
      **/
-    Dissolved: GenericPalletEvent<Rv, 'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Dissolved: GenericPalletEvent<'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * The result of trying to submit a new bid to the Slots pallet.
      **/
     HandleBidResult: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'HandleBidResult',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; result: Result<[], DispatchError> }
@@ -3164,13 +2957,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The configuration to a crowdloan has been edited.
      **/
-    Edited: GenericPalletEvent<Rv, 'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Edited: GenericPalletEvent<'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * A memo has been updated.
      **/
     MemoUpdated: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'MemoUpdated',
       { who: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; memo: Bytes }
@@ -3180,7 +2972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain has been moved to `NewRaise`
      **/
     AddedToNewRaise: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'AddedToNewRaise',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -3189,7 +2980,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Coretime`'s events
@@ -3198,17 +2989,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The broker chain has asked for revenue information for a specific block.
      **/
-    RevenueInfoRequested: GenericPalletEvent<Rv, 'Coretime', 'RevenueInfoRequested', { when: number }>;
+    RevenueInfoRequested: GenericPalletEvent<'Coretime', 'RevenueInfoRequested', { when: number }>;
 
     /**
      * A core has received a new assignment from the broker chain.
      **/
-    CoreAssigned: GenericPalletEvent<Rv, 'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
+    CoreAssigned: GenericPalletEvent<'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmPallet`'s events
@@ -3217,13 +3008,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'Sent',
       {
@@ -3238,7 +3028,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SendFailed',
       {
@@ -3253,7 +3042,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -3265,7 +3053,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3276,7 +3063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -3286,12 +3072,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Query response has been received and query is removed. The registered notification has
      * been dispatched and executed successfully.
      **/
-    Notified: GenericPalletEvent<
-      Rv,
-      'XcmPallet',
-      'Notified',
-      { queryId: bigint; palletIndex: number; callIndex: number }
-    >;
+    Notified: GenericPalletEvent<'XcmPallet', 'Notified', { queryId: bigint; palletIndex: number; callIndex: number }>;
 
     /**
      * Query response has been received and query is removed. The registered notification
@@ -3299,7 +3080,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyOverweight',
       {
@@ -3316,7 +3096,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3328,7 +3107,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3340,7 +3118,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -3356,7 +3133,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3365,13 +3141,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -3383,7 +3158,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3394,7 +3168,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -3405,7 +3178,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -3416,7 +3188,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -3432,7 +3203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3444,7 +3214,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerier',
       {
@@ -3460,7 +3229,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3470,7 +3238,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3481,7 +3248,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3491,7 +3257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -3501,7 +3266,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -3510,14 +3274,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'XcmPallet', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'XcmPallet', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -3527,7 +3290,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -3537,7 +3299,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -3546,7 +3307,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -3556,7 +3317,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -3584,7 +3344,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -3619,7 +3378,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -3649,7 +3407,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -3668,26 +3425,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3696,7 +3450,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RcMigrator`'s events
@@ -3706,7 +3460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'StageTransition',
       {
@@ -3730,7 +3483,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -3739,13 +3492,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * A query response has been received.
      **/
     QueryResponseReceived: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'QueryResponseReceived',
       {
@@ -3765,7 +3517,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A XCM message has been resent.
      **/
     XcmResendAttempt: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmResendAttempt',
       {
@@ -3785,7 +3536,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The unprocessed message buffer size has been set.
      **/
     UnprocessedMsgBufferSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'UnprocessedMsgBufferSet',
       {
@@ -3805,7 +3555,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Whether the AH UMP queue was prioritized for the next block.
      **/
     AhUmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePrioritySet',
       {
@@ -3832,7 +3581,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The AH UMP queue priority config was set.
      **/
     AhUmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePriorityConfigSet',
       {
@@ -3852,7 +3600,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The total issuance was recorded.
      **/
     MigratedBalanceRecordSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceRecordSet',
       { kept: bigint; migrated: bigint }
@@ -3862,7 +3609,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The RC kept balance was consumed.
      **/
     MigratedBalanceConsumed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceConsumed',
       { kept: bigint; migrated: bigint }
@@ -3872,7 +3618,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerSet',
       {
@@ -3892,7 +3637,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmSent',
       {
@@ -3906,13 +3650,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The staking elections were paused.
      **/
-    StakingElectionsPaused: GenericPalletEvent<Rv, 'RcMigrator', 'StakingElectionsPaused', null>;
+    StakingElectionsPaused: GenericPalletEvent<'RcMigrator', 'StakingElectionsPaused', null>;
 
     /**
      * The accounts to be preserved on Relay Chain were set.
      **/
     AccountsPreserved: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AccountsPreserved',
       {
@@ -3927,7 +3670,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The canceller account id was set.
      **/
     CancellerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'CancellerSet',
       {
@@ -3947,7 +3689,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The migration was paused.
      **/
     MigrationPaused: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigrationPaused',
       {
@@ -3961,13 +3702,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The migration was cancelled.
      **/
-    MigrationCancelled: GenericPalletEvent<Rv, 'RcMigrator', 'MigrationCancelled', null>;
+    MigrationCancelled: GenericPalletEvent<'RcMigrator', 'MigrationCancelled', null>;
 
     /**
      * Some pure accounts were indexed for possibly receiving free `Any` proxies.
      **/
     PureAccountsIndexed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'PureAccountsIndexed',
       {
@@ -3982,7 +3722,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager multisig dispatched something.
      **/
     ManagerMultisigDispatched: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerMultisigDispatched',
       { res: Result<[], DispatchError> }
@@ -3991,11 +3730,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The manager multisig received a vote.
      **/
-    ManagerMultisigVoted: GenericPalletEvent<Rv, 'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
+    ManagerMultisigVoted: GenericPalletEvent<'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/kusama/index.d.ts b/packages/chaintypes/src/kusama/index.d.ts
index 5fd603a2..6d0d82dd 100644
--- a/packages/chaintypes/src/kusama/index.d.ts
+++ b/packages/chaintypes/src/kusama/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   StagingKusamaRuntimeRuntimeCall,
@@ -41,26 +41,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedKusamaApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: KusamaApi
  * @specVersion: 1009002
  **/
-export interface KusamaApi {
-  legacy: VersionedKusamaApi<RpcLegacy>;
-  v2: VersionedKusamaApi<RpcV2>;
+export interface KusamaApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/kusama/json-rpc.d.ts b/packages/chaintypes/src/kusama/json-rpc.d.ts
index e84f3571..c021a2b3 100644
--- a/packages/chaintypes/src/kusama/json-rpc.d.ts
+++ b/packages/chaintypes/src/kusama/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -103,4 +103,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/kusama/query.d.ts b/packages/chaintypes/src/kusama/query.d.ts
index ada92fc0..d5555a2d 100644
--- a/packages/chaintypes/src/kusama/query.d.ts
+++ b/packages/chaintypes/src/kusama/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -168,7 +168,7 @@ import type {
   StagingKusamaRuntimeRuntimeCallLike,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -179,35 +179,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -215,7 +215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -223,28 +223,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -257,14 +257,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -281,21 +281,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -303,21 +303,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -330,12 +330,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -346,14 +346,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -361,14 +361,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -384,28 +384,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -420,7 +420,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -428,7 +428,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -436,7 +436,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -446,7 +446,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -457,7 +457,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -468,7 +468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -476,7 +476,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -484,7 +484,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -498,12 +498,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -514,7 +514,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -524,12 +524,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -541,12 +541,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -557,14 +557,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -595,7 +595,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -606,7 +606,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -616,7 +616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -624,7 +624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -633,7 +633,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -641,7 +640,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -651,18 +650,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -673,12 +672,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -689,14 +688,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -705,7 +704,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -715,28 +714,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -745,7 +744,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -756,7 +755,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -766,7 +765,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -776,14 +775,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -792,7 +791,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -818,14 +817,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -838,14 +837,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -854,7 +853,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -864,7 +863,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -874,7 +873,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -885,7 +884,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -900,7 +899,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -920,7 +919,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -947,7 +945,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -964,7 +961,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -980,7 +976,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -993,7 +989,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1006,7 +1001,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1015,7 +1010,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1024,14 +1019,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1040,7 +1035,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1049,7 +1044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1057,7 +1052,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1065,7 +1060,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1075,7 +1070,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1085,7 +1080,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1097,7 +1091,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1109,7 +1102,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1122,7 +1114,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1134,7 +1125,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1143,12 +1134,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -1160,7 +1151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -1169,7 +1160,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -1177,7 +1167,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -1189,19 +1179,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1212,14 +1202,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1227,7 +1217,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1235,7 +1225,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, StagingKusamaRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, StagingKusamaRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, StagingKusamaRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1246,7 +1236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1254,11 +1244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<StagingKusamaRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => StagingKusamaRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => StagingKusamaRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1267,7 +1253,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1275,7 +1260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1286,28 +1271,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1315,7 +1300,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1332,19 +1317,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -1355,19 +1340,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1381,7 +1366,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1392,14 +1377,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1409,14 +1394,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1424,19 +1409,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1450,7 +1435,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1463,12 +1447,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1479,7 +1463,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1487,7 +1471,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1498,7 +1482,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1506,7 +1490,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1519,12 +1503,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FellowshipCollective`'s storage queries
@@ -1537,7 +1521,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    memberCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The current members of the collective.
@@ -1545,11 +1529,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined,
-      AccountId32
-    >;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
 
     /**
      * The index of each ranks's member into the group of members who have at least that rank.
@@ -1557,7 +1537,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
+    idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
 
     /**
      * The members in the collective by index. All indices in the range `0..MemberCount` will
@@ -1566,7 +1546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
+    indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined, [number, number]>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1575,7 +1555,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
      **/
     voting: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined,
       [number, AccountId32]
     >;
@@ -1585,12 +1564,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FellowshipReferenda`'s storage queries
@@ -1601,7 +1580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1609,7 +1588,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1620,7 +1599,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1628,7 +1607,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1641,12 +1620,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1657,12 +1636,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1675,7 +1654,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<StagingKusamaRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: StagingKusamaRuntimeRuntimeParametersKey) => StagingKusamaRuntimeRuntimeParametersValue | undefined,
       StagingKusamaRuntimeRuntimeParametersKey
     >;
@@ -1683,7 +1661,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1694,13 +1672,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -1711,11 +1689,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -1724,7 +1698,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -1735,12 +1708,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Society`'s storage queries
@@ -1751,28 +1724,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
      **/
-    parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
+    parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
 
     /**
      * Amount of our account balance that is specifically for the next round's bid(s).
      *
      * @param {Callback<bigint> =} callback
      **/
-    pot: GenericStorageQuery<Rv, () => bigint>;
+    pot: GenericStorageQuery<() => bigint>;
 
     /**
      * The first member.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    founder: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The most primary from the most recently approved rank 0 members in the society.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    head: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * A hash of the rules of this society concerning membership. Can only be set once and
@@ -1780,7 +1753,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    rules: GenericStorageQuery<Rv, () => H256 | undefined>;
+    rules: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * The current members and their rank. Doesn't include `SuspendedMembers`.
@@ -1788,7 +1761,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * Information regarding rank-0 payouts, past and future.
@@ -1796,14 +1769,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyPayoutRecord> =} callback
      **/
-    payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
+    payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
 
     /**
      * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
      *
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, () => number>;
+    memberCount: GenericStorageQuery<() => number>;
 
     /**
      * The current items in `Members` keyed by their unique index. Keys are densely populated
@@ -1812,7 +1785,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The set of suspended members, with their old membership record.
@@ -1820,39 +1793,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    suspendedMembers: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined,
-      AccountId32
-    >;
+    suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * The number of rounds which have passed.
      *
      * @param {Callback<number> =} callback
      **/
-    roundCount: GenericStorageQuery<Rv, () => number>;
+    roundCount: GenericStorageQuery<() => number>;
 
     /**
      * The current bids, stored ordered by the value of the bid.
      *
      * @param {Callback<Array<PalletSocietyBid>> =} callback
      **/
-    bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
+    bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
+    candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
 
     /**
      * The current skeptic.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Double map from Candidate -> Voter -> (Maybe) Vote.
@@ -1861,7 +1830,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     votes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined,
       [AccountId32, AccountId32]
     >;
@@ -1872,7 +1840,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * At the end of the claim period, this contains the most recently approved members (along with
@@ -1881,21 +1849,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
      **/
-    nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
+    nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
 
     /**
      * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
      *
      * @param {Callback<number> =} callback
      **/
-    challengeRoundCount: GenericStorageQuery<Rv, () => number>;
+    challengeRoundCount: GenericStorageQuery<() => number>;
 
     /**
      * The defending member currently being challenged, along with a running tally of votes.
      *
      * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
      **/
-    defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+    defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
 
     /**
      * Votes for the defender, keyed by challenge round.
@@ -1904,7 +1872,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     defenderVotes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined,
       [number, AccountId32]
     >;
@@ -1914,19 +1881,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextIntakeAt: GenericStorageQuery<Rv, () => number | undefined>;
+    nextIntakeAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Next challenge rotation scheduled with [Config::BlockNumberProvider].
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextChallengeAt: GenericStorageQuery<Rv, () => number | undefined>;
+    nextChallengeAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -1938,11 +1905,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
-      AccountId32
-    >;
+    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
 
     /**
      * Active recovery attempts.
@@ -1954,7 +1917,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -1967,12 +1929,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1984,11 +1946,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -1997,12 +1955,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2013,7 +1971,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2021,7 +1979,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -2029,11 +1987,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2044,12 +1998,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -2062,11 +2016,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -2074,16 +2024,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -2096,7 +2042,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -2104,7 +2049,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -2118,7 +2063,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -2126,19 +2071,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2149,7 +2094,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2157,7 +2102,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2165,19 +2110,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2189,7 +2134,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -2198,7 +2143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -2206,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -2215,7 +2160,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -2228,7 +2172,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -2240,7 +2184,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -2248,12 +2192,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -2269,14 +2213,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -2285,7 +2229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -2295,7 +2239,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -2305,7 +2249,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -2315,7 +2259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -2330,7 +2274,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -2342,7 +2286,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -2357,7 +2301,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -2370,12 +2313,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2389,14 +2332,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2406,7 +2349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2414,7 +2357,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2424,12 +2367,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2444,14 +2387,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2464,7 +2407,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2472,7 +2415,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2480,7 +2423,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2488,7 +2431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2497,7 +2440,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2508,7 +2451,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2518,7 +2460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2526,14 +2468,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2542,14 +2484,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2558,14 +2500,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2573,21 +2515,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2598,14 +2540,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2613,16 +2555,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -2635,7 +2573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -2645,14 +2583,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -2666,12 +2604,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2687,7 +2625,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2697,7 +2634,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2705,23 +2642,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingAhClient`'s storage queries
@@ -2734,17 +2667,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    validatorSet: GenericStorageQuery<Rv, () => [number, Array<AccountId32>] | undefined>;
+    validatorSet: GenericStorageQuery<() => [number, Array<AccountId32>] | undefined>;
 
     /**
      * An incomplete validator set report.
      *
      * @param {Callback<PalletStakingAsyncRcClientValidatorSetReport | undefined> =} callback
      **/
-    incompleteValidatorSetReport: GenericStorageQuery<
-      Rv,
-      () => PalletStakingAsyncRcClientValidatorSetReport | undefined
-    >;
+    incompleteValidatorSetReport: GenericStorageQuery<() => PalletStakingAsyncRcClientValidatorSetReport | undefined>;
 
     /**
      * All of the points of the validators.
@@ -2755,7 +2685,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    validatorPoints: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    validatorPoints: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Indicates the current operating mode of the pallet.
@@ -2765,7 +2695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncAhClientOperatingMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletStakingAsyncAhClientOperatingMode>;
+    mode: GenericStorageQuery<() => PalletStakingAsyncAhClientOperatingMode>;
 
     /**
      * A storage value that is set when a `new_session` gives a new validator set to the session
@@ -2779,7 +2709,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextSessionChangesValidators: GenericStorageQuery<Rv, () => number | undefined>;
+    nextSessionChangesValidators: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The session index at which the latest elected validator set was applied.
@@ -2789,7 +2719,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetAppliedAt: GenericStorageQuery<Rv, () => number | undefined>;
+    validatorSetAppliedAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A session report that is outgoing, and should be sent.
@@ -2799,7 +2729,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientSessionReport, number] | undefined> =} callback
      **/
-    outgoingSessionReport: GenericStorageQuery<Rv, () => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
+    outgoingSessionReport: GenericStorageQuery<() => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
 
     /**
      * Internal storage item of [`OffenceSendQueue`]. Should not be used manually.
@@ -2808,7 +2738,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, PalletStakingAsyncRcClientOffence]>> =} callback
      **/
     offenceSendQueueOffences: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<[number, PalletStakingAsyncRcClientOffence]>,
       number
     >;
@@ -2818,12 +2747,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    offenceSendQueueCursor: GenericStorageQuery<Rv, () => number>;
+    offenceSendQueueCursor: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Configuration`'s storage queries
@@ -2834,7 +2763,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsConfigurationHostConfiguration> =} callback
      **/
-    activeConfig: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
+    activeConfig: GenericStorageQuery<() => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
 
     /**
      * Pending configuration changes.
@@ -2847,10 +2776,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>> =} callback
      **/
-    pendingConfigs: GenericStorageQuery<
-      Rv,
-      () => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>
-    >;
+    pendingConfigs: GenericStorageQuery<() => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>>;
 
     /**
      * If this is set, then the configuration setters will bypass the consistency checks. This
@@ -2858,12 +2784,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    bypassConsistencyCheck: GenericStorageQuery<Rv, () => boolean>;
+    bypassConsistencyCheck: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasShared`'s storage queries
@@ -2874,7 +2800,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * All the validators actively participating in parachain consensus.
@@ -2882,7 +2808,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex>> =} callback
      **/
-    activeValidatorIndices: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorIndex>>;
+    activeValidatorIndices: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorIndex>>;
 
     /**
      * The parachain attestation keys of the validators actively participating in parachain
@@ -2890,19 +2816,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorAppPublic>> =} callback
      **/
-    activeValidatorKeys: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
+    activeValidatorKeys: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
 
     /**
      * All allowed relay-parents.
      *
      * @param {Callback<PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker> =} callback
      **/
-    allowedRelayParents: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
+    allowedRelayParents: GenericStorageQuery<() => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInclusion`'s storage queries
@@ -2919,7 +2845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined> =} callback
      **/
     v1: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined,
@@ -2929,7 +2854,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInherent`'s storage queries
@@ -2945,19 +2870,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    included: GenericStorageQuery<Rv, () => [] | undefined>;
+    included: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Scraped on chain data for extracting resolved disputes as well as backing votes.
      *
      * @param {Callback<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined> =} callback
      **/
-    onChainVotes: GenericStorageQuery<Rv, () => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
+    onChainVotes: GenericStorageQuery<() => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaScheduler`'s storage queries
@@ -2974,7 +2899,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Array<PolkadotPrimitivesV8ValidatorIndex>>> =} callback
      **/
-    validatorGroups: GenericStorageQuery<Rv, () => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    validatorGroups: GenericStorageQuery<() => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * The block number where the session start occurred. Used to track how many group rotations
@@ -2987,7 +2912,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    sessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * One entry for each availability core. The `VecDeque` represents the assignments to be
@@ -2996,14 +2921,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>> =} callback
      **/
     claimQueue: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Paras`'s storage queries
@@ -3019,7 +2943,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined> =} callback
      **/
     pvfActiveVoteMap: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined,
@@ -3031,7 +2954,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>> =} callback
      **/
-    pvfActiveVoteList: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
+    pvfActiveVoteList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
 
     /**
      * All lease holding parachains. Ordered ascending by `ParaId`. On demand parachains are not
@@ -3041,7 +2964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachains: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The current lifecycle of a all known Para IDs.
@@ -3050,7 +2973,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaLifecycle | undefined> =} callback
      **/
     paraLifecycles: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaLifecycle | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3062,7 +2984,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesHeadData | undefined> =} callback
      **/
     heads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesHeadData | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3074,7 +2995,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     mostRecentContext: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3088,7 +3008,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     currentCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -3105,7 +3024,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     pastCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: [PolkadotParachainPrimitivesPrimitivesId, number],
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -3121,7 +3039,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaPastCodeMeta> =} callback
      **/
     pastCodeMeta: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaPastCodeMeta,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3136,7 +3053,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    pastCodePruning: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    pastCodePruning: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The block number at which the planned code change is expected for a parachain.
@@ -3148,7 +3065,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     futureCodeUpgrades: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3165,7 +3081,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    futureCodeUpgradesAt: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    futureCodeUpgradesAt: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actual future code hash of a para.
@@ -3176,7 +3092,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     futureCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -3190,7 +3105,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined> =} callback
      **/
     authorizedCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined,
@@ -3213,7 +3127,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
     upgradeGoAheadSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeGoAhead | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3233,7 +3146,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
     upgradeRestrictionSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeRestriction | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3245,7 +3157,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upgradeCooldowns: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upgradeCooldowns: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The list of upcoming code upgrades.
@@ -3257,7 +3169,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upcomingUpgrades: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upcomingUpgrades: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actions to perform during the start of a specific session index.
@@ -3265,7 +3177,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    actionsQueue: GenericStorageQuery<Rv, (arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
+    actionsQueue: GenericStorageQuery<(arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
 
     /**
      * Upcoming paras instantiation arguments.
@@ -3277,7 +3189,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaGenesisArgs | undefined> =} callback
      **/
     upcomingParasGenesis: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaGenesisArgs | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3289,7 +3200,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     codeByHashRefs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => number,
       PolkadotParachainPrimitivesPrimitivesValidationCodeHash
     >;
@@ -3304,7 +3214,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined> =} callback
      **/
     codeByHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCode | undefined,
@@ -3314,7 +3223,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Initializer`'s storage queries
@@ -3332,7 +3241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    hasInitialized: GenericStorageQuery<Rv, () => [] | undefined>;
+    hasInitialized: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Buffered session changes.
@@ -3345,15 +3254,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>> =} callback
      **/
-    bufferedSessionChanges: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>
-    >;
+    bufferedSessionChanges: GenericStorageQuery<() => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dmp`'s storage queries
@@ -3366,7 +3272,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundDownwardMessage>> =} callback
      **/
     downwardMessageQueues: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotCorePrimitivesInboundDownwardMessage>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3384,7 +3289,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256> =} callback
      **/
     downwardMessageQueueHeads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => H256,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3396,7 +3300,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3404,7 +3307,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hrmp`'s storage queries
@@ -3422,7 +3325,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined> =} callback
      **/
     hrmpOpenChannelRequests: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
       ) => PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined,
@@ -3433,10 +3335,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpOpenChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpOpenChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * This mapping tracks how many open channel requests are initiated by a given sender para.
@@ -3447,7 +3346,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpOpenChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3461,7 +3359,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpAcceptedChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3479,7 +3376,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     hrmpCloseChannelRequests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => [] | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3488,10 +3384,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpCloseChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpCloseChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * The HRMP watermark associated with each para.
@@ -3503,7 +3396,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     hrmpWatermarks: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3517,7 +3409,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpChannel | undefined> =} callback
      **/
     hrmpChannels: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => PolkadotRuntimeParachainsHrmpHrmpChannel | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3541,7 +3432,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpIngressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3552,7 +3442,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpEgressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3565,7 +3454,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundHrmpMessage>> =} callback
      **/
     hrmpChannelContents: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => Array<PolkadotCorePrimitivesInboundHrmpMessage>,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3582,7 +3470,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>> =} callback
      **/
     hrmpChannelDigests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3590,7 +3477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaSessionInfo`'s storage queries
@@ -3603,14 +3490,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8AssignmentAppPublic>> =} callback
      **/
-    assignmentKeysUnsafe: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
+    assignmentKeysUnsafe: GenericStorageQuery<() => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
 
     /**
      * The earliest session for which previous session info is stored.
      *
      * @param {Callback<number> =} callback
      **/
-    earliestStoredSession: GenericStorageQuery<Rv, () => number>;
+    earliestStoredSession: GenericStorageQuery<() => number>;
 
     /**
      * Session information in a rolling window.
@@ -3620,7 +3507,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8SessionInfo | undefined> =} callback
      **/
-    sessions: GenericStorageQuery<Rv, (arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
+    sessions: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
 
     /**
      * The validator account keys of the validators actively participating in parachain consensus.
@@ -3628,7 +3515,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
-    accountKeys: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32> | undefined, number>;
+    accountKeys: GenericStorageQuery<(arg: number) => Array<AccountId32> | undefined, number>;
 
     /**
      * Executor parameter set for a given session index
@@ -3636,16 +3523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8ExecutorParams | undefined> =} callback
      **/
-    sessionExecutorParams: GenericStorageQuery<
-      Rv,
-      (arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined,
-      number
-    >;
+    sessionExecutorParams: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasDisputes`'s storage queries
@@ -3657,7 +3540,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastPrunedSession: GenericStorageQuery<Rv, () => number | undefined>;
+    lastPrunedSession: GenericStorageQuery<() => number | undefined>;
 
     /**
      * All ongoing or concluded disputes for the last several sessions.
@@ -3666,7 +3549,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8DisputeState | undefined> =} callback
      **/
     disputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesV8DisputeState | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3679,7 +3561,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex> | undefined> =} callback
      **/
     backersOnDisputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => Array<PolkadotPrimitivesV8ValidatorIndex> | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3692,7 +3573,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     included: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => number | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3705,12 +3585,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    frozen: GenericStorageQuery<Rv, () => number | undefined>;
+    frozen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasSlashing`'s storage queries
@@ -3723,7 +3603,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesVstagingPendingSlashes | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesVstagingPendingSlashes | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3734,12 +3613,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetCounts: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    validatorSetCounts: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s storage queries
@@ -3754,7 +3633,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined> =} callback
      **/
     paraIdAffinity: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined,
@@ -3766,14 +3644,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesQueueStatusType> =} callback
      **/
-    queueStatus: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
+    queueStatus: GenericStorageQuery<() => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
 
     /**
      * Priority queue for all orders which don't yet (or not any more) have any core affinity.
      *
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
-    freeEntries: GenericStorageQuery<Rv, () => BinaryHeapEnqueuedOrder>;
+    freeEntries: GenericStorageQuery<() => BinaryHeapEnqueuedOrder>;
 
     /**
      * Queue entries that are currently bound to a particular core due to core affinity.
@@ -3782,7 +3660,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
     affinityEntries: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => BinaryHeapEnqueuedOrder,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3792,7 +3669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<bigint>> =} callback
      **/
-    revenue: GenericStorageQuery<Rv, () => Array<bigint>>;
+    revenue: GenericStorageQuery<() => Array<bigint>>;
 
     /**
      * Keeps track of credits owned by each account.
@@ -3800,12 +3677,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    credits: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    credits: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s storage queries
@@ -3821,7 +3698,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined> =} callback
      **/
     coreSchedules: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotPrimitivesV8CoreIndex]) => PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined,
       [number, PolkadotPrimitivesV8CoreIndex]
     >;
@@ -3836,7 +3712,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor> =} callback
      **/
     coreDescriptors: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3844,7 +3719,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Registrar`'s storage queries
@@ -3857,7 +3732,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId | undefined> =} callback
      **/
     pendingSwap: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesId | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3872,7 +3746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonParasRegistrarParaInfo | undefined> =} callback
      **/
     paras: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonParasRegistrarParaInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3882,12 +3755,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    nextFreeParaId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    nextFreeParaId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Slots`'s storage queries
@@ -3915,7 +3788,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint] | undefined>> =} callback
      **/
     leases: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[AccountId32, bigint] | undefined>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3923,7 +3795,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Auctions`'s storage queries
@@ -3934,7 +3806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    auctionCounter: GenericStorageQuery<Rv, () => number>;
+    auctionCounter: GenericStorageQuery<() => number>;
 
     /**
      * Information relating to the current auction, if there is one.
@@ -3945,7 +3817,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    auctionInfo: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    auctionInfo: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Amounts currently reserved in the accounts of the bidders currently winning
@@ -3955,7 +3827,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     reservedAmounts: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PolkadotParachainPrimitivesPrimitivesId]) => bigint | undefined,
       [AccountId32, PolkadotParachainPrimitivesPrimitivesId]
     >;
@@ -3969,7 +3840,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined> =} callback
      **/
     winning: GenericStorageQuery<
-      Rv,
       (
         arg: number,
       ) => FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined,
@@ -3979,7 +3849,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Crowdloan`'s storage queries
@@ -3992,7 +3862,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonCrowdloanFundInfo | undefined> =} callback
      **/
     funds: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonCrowdloanFundInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -4003,26 +3872,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    newRaise: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    newRaise: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The number of auctions that have entered into their ending period so far.
      *
      * @param {Callback<number> =} callback
      **/
-    endingsCount: GenericStorageQuery<Rv, () => number>;
+    endingsCount: GenericStorageQuery<() => number>;
 
     /**
      * Tracker for the next available fund index
      *
      * @param {Callback<number> =} callback
      **/
-    nextFundIndex: GenericStorageQuery<Rv, () => number>;
+    nextFundIndex: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmPallet`'s storage queries
@@ -4033,7 +3902,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -4041,7 +3910,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -4052,7 +3921,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -4060,7 +3929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -4069,7 +3938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -4081,7 +3949,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -4094,7 +3961,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -4106,14 +3972,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -4122,7 +3988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -4134,7 +3999,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -4144,7 +4008,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -4157,7 +4021,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -4169,7 +4033,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -4180,7 +4044,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -4188,7 +4051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -4201,7 +4064,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin) => PalletMessageQueueBookState,
       PolkadotRuntimeParachainsInclusionAggregateMessageOrigin
     >;
@@ -4211,7 +4073,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -4220,7 +4082,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]
     >;
@@ -4228,7 +4089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -4243,7 +4104,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -4251,7 +4111,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -4262,21 +4122,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -4293,7 +4153,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -4302,12 +4162,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -4318,14 +4178,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -4336,12 +4196,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BeefyMmrLeaf`'s storage queries
@@ -4352,7 +4212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -4361,12 +4221,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RcMigrator`'s storage queries
@@ -4377,7 +4237,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorMigrationStage> =} callback
      **/
-    rcMigrationStage: GenericStorageQuery<Rv, () => PalletRcMigratorMigrationStage>;
+    rcMigrationStage: GenericStorageQuery<() => PalletRcMigratorMigrationStage>;
 
     /**
      * Helper storage item to obtain and store the known accounts that should be kept partially or
@@ -4387,7 +4247,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRcMigratorAccountsAccountState | undefined> =} callback
      **/
     rcAccounts: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletRcMigratorAccountsAccountState | undefined,
       AccountId32
     >;
@@ -4397,14 +4256,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRcAccounts: GenericStorageQuery<Rv, () => number>;
+    counterForRcAccounts: GenericStorageQuery<() => number>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain.
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalance: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalance: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain after
@@ -4416,7 +4275,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalanceArchive: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalanceArchive: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * The pending XCM messages.
@@ -4428,14 +4287,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    pendingXcmMessages: GenericStorageQuery<Rv, (arg: H256) => StagingXcmV5Xcm | undefined, H256>;
+    pendingXcmMessages: GenericStorageQuery<(arg: H256) => StagingXcmV5Xcm | undefined, H256>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingXcmMessages: GenericStorageQuery<Rv, () => number>;
+    counterForPendingXcmMessages: GenericStorageQuery<() => number>;
 
     /**
      * Accounts that use the proxy pallet to delegate permissions and have no nonce.
@@ -4445,7 +4304,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    pureProxyCandidatesMigrated: GenericStorageQuery<Rv, (arg: AccountId32Like) => boolean | undefined, AccountId32>;
+    pureProxyCandidatesMigrated: GenericStorageQuery<(arg: AccountId32Like) => boolean | undefined, AccountId32>;
 
     /**
      * The pending XCM response queries and their XCM hash referencing the message in the
@@ -4459,14 +4318,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pendingXcmQueries: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    pendingXcmQueries: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Manual override for `type UnprocessedMsgBuffer: Get<u32>`. Look there for docs.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    unprocessedMsgBuffer: GenericStorageQuery<Rv, () => number | undefined>;
+    unprocessedMsgBuffer: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The priority of the Asset Hub UMP queue during migration.
@@ -4478,7 +4337,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    ahUmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    ahUmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -4488,7 +4347,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * An optional account id of a canceller.
@@ -4497,7 +4356,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    canceller: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    canceller: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -4507,7 +4366,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -4517,7 +4376,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The duration of the pre migration warm-up period.
@@ -4527,7 +4386,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    warmUpPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    warmUpPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      * The duration of the post migration cool-off period.
@@ -4538,7 +4397,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    coolOffPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    coolOffPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      *
@@ -4546,7 +4405,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<SpRuntimeMultiSigner>> =} callback
      **/
     managerMultisigs: GenericStorageQuery<
-      Rv,
       (arg: StagingKusamaRuntimeRuntimeCallLike) => Array<SpRuntimeMultiSigner>,
       StagingKusamaRuntimeRuntimeCall
     >;
@@ -4555,11 +4413,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    managerMultisigRound: GenericStorageQuery<Rv, () => number>;
+    managerMultisigRound: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/kusama/runtime.d.ts b/packages/chaintypes/src/kusama/runtime.d.ts
index feb236a9..ed5f16a2 100644
--- a/packages/chaintypes/src/kusama/runtime.d.ts
+++ b/packages/chaintypes/src/kusama/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -90,7 +90,7 @@ import type {
   XcmRuntimeApisConversionsError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Inflation - 0xc51ff1fa3f5d0cca
    **/
@@ -103,12 +103,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Inflation_experimental_inflation_prediction_info
      **/
-    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<Rv, () => Promise<RelayCommonApisInflationInfo>>;
+    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<() => Promise<RelayCommonApisInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -119,7 +119,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -127,7 +127,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -135,12 +135,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -151,7 +151,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -162,7 +162,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -171,12 +171,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -192,7 +192,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -203,7 +202,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -212,7 +211,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -224,14 +222,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -254,7 +251,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -267,7 +263,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -279,12 +275,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ParachainHost - 0xaf2c0297a23e6d3d
@@ -295,7 +291,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validators
      **/
-    validators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
+    validators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
 
     /**
      * Returns the validator groups and rotation info localized based on the hypothetical child
@@ -305,7 +301,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_validator_groups
      **/
     validatorGroups: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<[Array<Array<PolkadotPrimitivesV8ValidatorIndex>>, PolkadotPrimitivesV8GroupRotationInfo]>
     >;
 
@@ -315,7 +310,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_availability_cores
      **/
-    availabilityCores: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
+    availabilityCores: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
 
     /**
      * Yields the persisted validation data for the given `ParaId` along with an assumption that
@@ -329,7 +324,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     persistedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -346,7 +340,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} expected_persisted_validation_data_hash
      **/
     assumedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         expectedPersistedValidationDataHash: H256,
@@ -364,7 +357,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8CandidateCommitments} outputs
      **/
     checkValidationOutputs: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         outputs: PolkadotPrimitivesV8CandidateCommitments,
@@ -378,7 +370,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_session_index_for_child
      **/
-    sessionIndexForChild: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    sessionIndexForChild: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Fetch the validation code used by a para, making the given `OccupiedCoreAssumption`.
@@ -391,7 +383,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCode: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -406,7 +397,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatePendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2 | undefined>
@@ -417,7 +407,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_candidate_events
      **/
-    candidateEvents: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
+    candidateEvents: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
 
     /**
      * Get all the pending inbound messages in the downward message queue for a para.
@@ -426,7 +416,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     dmqContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotCorePrimitivesInboundDownwardMessage>>
@@ -440,7 +429,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     inboundHrmpChannelsContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<[PolkadotParachainPrimitivesPrimitivesId, Array<PolkadotCorePrimitivesInboundHrmpMessage>]>>
@@ -453,7 +441,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} hash
      **/
     validationCodeByHash: GenericRuntimeApiMethod<
-      Rv,
       (
         hash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => Promise<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined>
@@ -464,7 +451,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_on_chain_votes
      **/
-    onChainVotes: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
+    onChainVotes: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
 
     /**
      * Get the session info for the given session, if stored.
@@ -474,7 +461,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_session_info
      * @param {number} index
      **/
-    sessionInfo: GenericRuntimeApiMethod<Rv, (index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
+    sessionInfo: GenericRuntimeApiMethod<(index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
 
     /**
      * Submits a PVF pre-checking statement into the transaction pool.
@@ -486,7 +473,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     submitPvfCheckStatement: GenericRuntimeApiMethod<
-      Rv,
       (stmt: PolkadotPrimitivesV8PvfCheckStatement, signature: PolkadotPrimitivesV8ValidatorAppSignature) => Promise<[]>
     >;
 
@@ -498,7 +484,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_pvfs_require_precheck
      **/
     pvfsRequirePrecheck: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>
     >;
 
@@ -512,7 +497,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCodeHash: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -525,7 +509,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_disputes
      **/
     disputes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8DisputeState]>>
     >;
 
@@ -536,7 +519,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session_index
      **/
     sessionExecutorParams: GenericRuntimeApiMethod<
-      Rv,
       (sessionIndex: number) => Promise<PolkadotPrimitivesV8ExecutorParams | undefined>
     >;
 
@@ -547,7 +529,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_unapplied_slashes
      **/
     unappliedSlashes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8SlashingPendingSlashes]>>
     >;
 
@@ -559,7 +540,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppPublic} validator_id
      **/
     keyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         validatorId: PolkadotPrimitivesV8ValidatorAppPublic,
       ) => Promise<PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof | undefined>
@@ -575,7 +555,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof} key_ownership_proof
      **/
     submitReportDisputeLost: GenericRuntimeApiMethod<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesV8SlashingDisputeProof,
         keyOwnershipProof: PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof,
@@ -588,7 +567,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_minimum_backing_votes
      **/
-    minimumBackingVotes: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    minimumBackingVotes: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the state of parachain backing for a given para.
@@ -597,7 +576,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} __runtime_api_generated_name_0__
      **/
     paraBackingState: GenericRuntimeApiMethod<
-      Rv,
       (
         runtimeApiGeneratedName0: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingBackingState | undefined>
@@ -608,14 +586,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_async_backing_params
      **/
-    asyncBackingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
+    asyncBackingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
 
     /**
      * Returns a list of all disabled validators at the given block.
      *
      * @callname: ParachainHost_disabled_validators
      **/
-    disabledValidators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    disabledValidators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * Get node features.
@@ -623,14 +601,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_node_features
      **/
-    nodeFeatures: GenericRuntimeApiMethod<Rv, () => Promise<BitSequence>>;
+    nodeFeatures: GenericRuntimeApiMethod<() => Promise<BitSequence>>;
 
     /**
      * Approval voting configuration parameters
      *
      * @callname: ParachainHost_approval_voting_params
      **/
-    approvalVotingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
+    approvalVotingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
 
     /**
      * Claim queue
@@ -638,7 +616,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_claim_queue
      **/
     claimQueue: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotParachainPrimitivesPrimitivesId>]>>
     >;
 
@@ -649,7 +626,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatesPendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2>>
@@ -660,7 +636,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validation_code_bomb_limit
      **/
-    validationCodeBombLimit: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    validationCodeBombLimit: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the constraints on the actions that can be taken by a new parachain
@@ -670,7 +646,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     backingConstraints: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingConstraints | undefined>
@@ -681,12 +656,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_scheduling_lookahead
      **/
-    schedulingLookahead: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    schedulingLookahead: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyApi - 0x49eaaf1b548a0cb0
@@ -697,14 +672,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyApi_beefy_genesis
      **/
-    beefyGenesis: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    beefyGenesis: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Return the current active BEEFY validator set
      *
      * @callname: BeefyApi_validator_set
      **/
-    validatorSet: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyValidatorSet | undefined>>;
+    validatorSet: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyValidatorSet | undefined>>;
 
     /**
      * Submits an unsigned extrinsic to report a double voting equivocation. The caller
@@ -721,7 +696,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportDoubleVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -743,7 +717,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportForkVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProofOpaqueValue,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -765,7 +738,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportFutureBlockVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -790,7 +762,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBeefyEcdsaCryptoPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusBeefyEcdsaCryptoPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -803,14 +774,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateAncestryProof: GenericRuntimeApiMethod<
-      Rv,
       (prevBlockNumber: number, bestKnownBlockNumber?: number | undefined) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MmrApi - 0x91d5df18b0d2cf58
@@ -821,14 +791,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MmrApi_mmr_root
      **/
-    mmrRoot: GenericRuntimeApiMethod<Rv, () => Promise<Result<H256, SpMmrPrimitivesError>>>;
+    mmrRoot: GenericRuntimeApiMethod<() => Promise<Result<H256, SpMmrPrimitivesError>>>;
 
     /**
      * Return the number of MMR blocks in the chain.
      *
      * @callname: MmrApi_mmr_leaf_count
      **/
-    mmrLeafCount: GenericRuntimeApiMethod<Rv, () => Promise<Result<bigint, SpMmrPrimitivesError>>>;
+    mmrLeafCount: GenericRuntimeApiMethod<() => Promise<Result<bigint, SpMmrPrimitivesError>>>;
 
     /**
      * Generate MMR proof for a series of block numbers. If `best_known_block_number = Some(n)`,
@@ -839,7 +809,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateProof: GenericRuntimeApiMethod<
-      Rv,
       (
         blockNumbers: Array<number>,
         bestKnownBlockNumber?: number | undefined,
@@ -858,7 +827,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProof: GenericRuntimeApiMethod<
-      Rv,
       (
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
         proof: SpMmrPrimitivesLeafProof,
@@ -880,7 +848,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProofStateless: GenericRuntimeApiMethod<
-      Rv,
       (
         root: H256,
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
@@ -891,7 +858,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyMmrApi - 0x2a5e924655399e60
@@ -902,19 +869,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyMmrApi_authority_set_proof
      **/
-    authoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    authoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Return the next/queued BEEFY authority set proof.
      *
      * @callname: BeefyMmrApi_next_authority_set_proof
      **/
-    nextAuthoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    nextAuthoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -930,7 +897,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -947,7 +914,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -972,7 +938,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -981,12 +946,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
@@ -997,21 +962,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -1019,7 +984,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -1039,7 +1004,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -1061,7 +1025,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -1071,7 +1034,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -1082,12 +1045,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -1105,7 +1068,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -1116,14 +1079,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -1135,12 +1097,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -1153,7 +1115,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1164,7 +1125,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1173,19 +1133,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -1199,7 +1159,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: StagingKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1211,7 +1170,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: StagingKusamaRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1221,7 +1179,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -1229,12 +1187,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -1251,7 +1209,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -1266,7 +1223,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -1283,7 +1239,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -1302,7 +1257,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -1312,7 +1266,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -1327,7 +1281,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: StagingKusamaRuntimeOriginCaller,
         call: StagingKusamaRuntimeRuntimeCallLike,
@@ -1343,7 +1296,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -1353,7 +1305,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -1366,14 +1318,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -1385,7 +1336,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -1394,7 +1345,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -1403,7 +1354,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -1411,7 +1362,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -1422,7 +1373,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -1437,7 +1388,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -1451,7 +1402,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -1459,7 +1410,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -1467,7 +1418,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -1475,12 +1426,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -1492,7 +1443,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -1501,7 +1452,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -1510,12 +1461,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1536,7 +1487,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1557,7 +1508,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1567,11 +1518,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/kusama/tx.d.ts b/packages/chaintypes/src/kusama/tx.d.ts
index dbe9af22..06d39c81 100644
--- a/packages/chaintypes/src/kusama/tx.d.ts
+++ b/packages/chaintypes/src/kusama/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -101,16 +99,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = StagingKusamaRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<StagingKusamaRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -123,16 +123,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -142,16 +141,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -161,16 +159,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -183,16 +180,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -202,16 +198,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -221,16 +216,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -244,19 +238,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -266,16 +259,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -288,16 +280,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -314,16 +305,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -341,23 +331,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -373,19 +362,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -403,19 +391,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -428,23 +415,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -474,23 +460,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -513,16 +498,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -544,19 +528,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -577,16 +560,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -610,20 +592,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -644,16 +625,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -672,23 +652,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -707,19 +686,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -732,20 +710,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -761,19 +738,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -798,19 +774,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -823,19 +798,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -852,16 +826,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -874,19 +847,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -901,19 +873,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -930,26 +901,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -977,19 +947,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1012,16 +981,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1051,16 +1019,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1092,16 +1059,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1115,16 +1081,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1143,16 +1108,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1170,15 +1134,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1199,16 +1162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1230,15 +1192,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1253,16 +1214,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1278,16 +1238,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1303,16 +1262,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1333,15 +1291,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1363,15 +1320,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1383,16 +1339,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1410,19 +1365,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1439,15 +1393,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1463,19 +1416,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1498,19 +1450,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1526,16 +1477,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1563,19 +1513,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1595,16 +1544,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1636,7 +1584,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -1646,7 +1593,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -1661,7 +1607,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1696,16 +1643,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1717,16 +1663,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1739,16 +1684,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1776,20 +1720,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1804,16 +1747,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1829,16 +1771,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1861,14 +1802,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -1880,7 +1819,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1896,16 +1836,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1937,27 +1876,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} slashFraction
      **/
     manualSlash: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         slashFraction: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ManualSlash';
             params: { validatorStash: AccountId32Like; era: number; slashFraction: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1978,19 +1916,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: StagingKusamaRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: StagingKusamaRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2010,22 +1947,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -2041,19 +1977,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2072,19 +2007,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2106,26 +2040,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -2154,19 +2087,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2196,16 +2128,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2243,14 +2174,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: XcmVersionedLocation,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -2262,7 +2191,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2292,16 +2222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2331,16 +2260,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2365,23 +2293,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -2402,19 +2329,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2449,14 +2375,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -2468,7 +2392,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2491,16 +2416,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2519,19 +2443,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2570,19 +2493,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2609,27 +2531,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -2651,13 +2572,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: StagingKusamaRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -2668,7 +2587,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2685,16 +2605,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2710,16 +2629,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2734,16 +2652,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2758,16 +2675,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2780,16 +2696,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2807,16 +2722,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2832,16 +2746,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2858,26 +2771,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FellowshipCollective`'s transaction calls
@@ -2894,16 +2806,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2918,16 +2829,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     promoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'PromoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2943,16 +2853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     demoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'DemoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2969,19 +2878,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} minRank
      **/
     removeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         minRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike; minRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3002,19 +2910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} aye
      **/
     vote: GenericTxCall<
-      Rv,
       (
         poll: number,
         aye: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'Vote';
             params: { poll: number; aye: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3034,19 +2941,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupPoll: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'CleanupPoll';
             params: { pollIndex: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3061,26 +2967,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newWho
      **/
     exchangeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newWho: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'ExchangeMember';
             params: { who: MultiAddressLike; newWho: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FellowshipReferenda`'s transaction calls
@@ -3102,13 +3007,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: StagingKusamaRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
@@ -3119,7 +3022,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3136,16 +3040,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3161,16 +3064,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3185,16 +3087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3209,16 +3110,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3231,16 +3131,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3258,16 +3157,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3283,16 +3181,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3309,26 +3206,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -3339,16 +3235,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3357,16 +3252,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3377,20 +3271,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3399,23 +3292,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: StagingKusamaRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -3430,23 +3322,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: StagingKusamaRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: StagingKusamaRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -3482,19 +3373,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3521,14 +3411,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3540,7 +3428,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3578,13 +3467,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3595,7 +3482,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3623,16 +3511,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3643,27 +3530,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -3692,16 +3578,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<StagingKusamaRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<StagingKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<StagingKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3724,19 +3609,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3758,16 +3642,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<StagingKusamaRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<StagingKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<StagingKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3783,19 +3666,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: StagingKusamaRuntimeOriginCaller,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: StagingKusamaRuntimeOriginCaller; call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3817,16 +3699,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<StagingKusamaRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<StagingKusamaRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<StagingKusamaRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3842,19 +3723,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: StagingKusamaRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: StagingKusamaRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3887,19 +3767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: StagingKusamaRuntimeRuntimeCallLike,
         fallback: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: StagingKusamaRuntimeRuntimeCallLike; fallback: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3914,26 +3793,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: StagingKusamaRuntimeOriginCaller,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: StagingKusamaRuntimeOriginCaller; call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Society`'s transaction calls
@@ -3953,16 +3831,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     bid: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Bid';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3977,15 +3854,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unbid: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unbid';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4013,20 +3889,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} tip
      **/
     vouch: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         value: bigint,
         tip: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vouch';
             params: { who: MultiAddressLike; value: bigint; tip: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4041,15 +3916,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unvouch: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unvouch';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4067,19 +3941,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         candidate: MultiAddressLike,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vote';
             params: { candidate: MultiAddressLike; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4095,16 +3968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     defenderVote: GenericTxCall<
-      Rv,
       (approve: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DefenderVote';
             params: { approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4122,15 +3994,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     payout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Payout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4141,16 +4012,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     waiveRepay: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'WaiveRepay';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4181,7 +4051,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} rules
      **/
     foundSociety: GenericTxCall<
-      Rv,
       (
         founder: MultiAddressLike,
         maxMembers: number,
@@ -4190,7 +4059,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         candidateDeposit: bigint,
         rules: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
@@ -4204,7 +4072,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               rules: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4217,15 +4086,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     dissolve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Dissolve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4249,19 +4117,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} forgive
      **/
     judgeSuspendedMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         forgive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'JudgeSuspendedMember';
             params: { who: MultiAddressLike; forgive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4285,21 +4152,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} candidateDeposit
      **/
     setParameters: GenericTxCall<
-      Rv,
       (
         maxMembers: number,
         maxIntake: number,
         maxStrikes: number,
         candidateDeposit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'SetParameters';
             params: { maxMembers: number; maxIntake: number; maxStrikes: number; candidateDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4309,15 +4175,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     punishSkeptic: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'PunishSkeptic';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4327,15 +4192,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimMembership: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ClaimMembership';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4347,16 +4211,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     bestowMembership: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'BestowMembership';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4370,16 +4233,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     kickCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'KickCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4390,15 +4252,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resignCandidacy: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ResignCandidacy';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4412,16 +4273,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     dropCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DropCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4434,19 +4294,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupCandidacy: GenericTxCall<
-      Rv,
       (
         candidate: AccountId32Like,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupCandidacy';
             params: { candidate: AccountId32Like; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4459,19 +4318,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupChallenge: GenericTxCall<
-      Rv,
       (
         challengeRound: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupChallenge';
             params: { challengeRound: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4486,22 +4344,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Recovery`'s transaction calls
@@ -4521,19 +4378,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     asRecovered: GenericTxCall<
-      Rv,
       (
         account: MultiAddressLike,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'AsRecovered';
             params: { account: MultiAddressLike; call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4551,19 +4407,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     setRecovered: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'SetRecovered';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4590,20 +4445,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayPeriod
      **/
     createRecovery: GenericTxCall<
-      Rv,
       (
         friends: Array<AccountId32Like>,
         threshold: number,
         delayPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CreateRecovery';
             params: { friends: Array<AccountId32Like>; threshold: number; delayPeriod: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4623,16 +4477,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     initiateRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'InitiateRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4654,19 +4507,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     vouchRecovery: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'VouchRecovery';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4684,16 +4536,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     claimRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'ClaimRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4713,16 +4564,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     closeRecovery: GenericTxCall<
-      Rv,
       (rescuer: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CloseRecovery';
             params: { rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4741,15 +4591,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeRecovery: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'RemoveRecovery';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4765,16 +4614,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     cancelRecovered: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CancelRecovered';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4806,23 +4654,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeAccount
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (maybeAccount: MultiAddressLike | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'PokeDeposit';
             params: { maybeAccount: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -4841,15 +4688,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4869,16 +4715,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4901,19 +4746,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4938,20 +4782,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4982,19 +4825,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5010,26 +4852,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -5044,14 +4885,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5063,7 +4902,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5074,19 +4914,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5100,7 +4939,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -5108,7 +4946,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5121,7 +4958,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5131,16 +4969,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5153,14 +4990,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5172,7 +5007,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5186,7 +5022,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -5194,7 +5029,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -5207,7 +5041,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5230,20 +5065,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5266,20 +5100,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5289,16 +5122,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5308,23 +5140,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -5346,13 +5177,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: KusamaRuntimeConstantsProxyProxyType | undefined,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -5363,7 +5192,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5383,20 +5213,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: KusamaRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: KusamaRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5414,20 +5243,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: KusamaRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: KusamaRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5441,15 +5269,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5478,20 +5305,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: KusamaRuntimeConstantsProxyProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: KusamaRuntimeConstantsProxyProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5520,7 +5346,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: KusamaRuntimeConstantsProxyProxyType,
@@ -5528,7 +5353,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -5541,7 +5365,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5566,19 +5391,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5598,19 +5422,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5630,19 +5453,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5665,14 +5487,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: KusamaRuntimeConstantsProxyProxyType | undefined,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -5684,7 +5504,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: StagingKusamaRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5700,22 +5521,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -5739,19 +5559,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingKusamaRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: StagingKusamaRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: StagingKusamaRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5803,7 +5622,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -5811,7 +5629,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: StagingKusamaRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5824,7 +5641,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5867,7 +5685,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -5875,7 +5692,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5888,7 +5704,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5921,14 +5738,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5940,7 +5755,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5964,27 +5780,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -5999,16 +5814,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6023,16 +5837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6045,16 +5858,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6066,16 +5878,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6087,23 +5898,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -6127,19 +5937,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6155,16 +5964,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6181,20 +5989,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6220,16 +6027,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6245,16 +6051,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6274,19 +6079,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6303,16 +6107,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6330,16 +6133,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6358,19 +6160,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6392,20 +6193,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6429,23 +6229,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -6477,20 +6276,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6517,21 +6315,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6560,19 +6357,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6616,19 +6412,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6656,20 +6451,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6695,19 +6489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6739,26 +6532,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -6784,12 +6576,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -6799,7 +6589,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6813,16 +6604,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6839,16 +6629,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6866,16 +6655,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6887,22 +6675,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -6923,16 +6710,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6951,16 +6737,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6973,26 +6758,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -7020,19 +6804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7048,16 +6831,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7073,15 +6855,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7122,19 +6903,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7150,19 +6930,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7194,19 +6973,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7235,21 +7013,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7268,7 +7045,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -7276,7 +7052,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -7289,7 +7064,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7311,19 +7087,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7343,19 +7118,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7369,19 +7143,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7406,7 +7179,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -7415,7 +7187,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -7429,7 +7200,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7448,14 +7220,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -7467,7 +7237,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7493,16 +7264,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7521,19 +7291,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7549,16 +7318,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7571,16 +7339,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7595,19 +7362,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7622,19 +7388,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7648,19 +7413,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7685,16 +7449,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7710,16 +7473,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7733,19 +7495,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7763,16 +7524,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7790,16 +7550,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7817,23 +7576,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -7869,15 +7627,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7903,15 +7660,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7933,23 +7689,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingAhClient`'s transaction calls
@@ -7960,16 +7715,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientValidatorSetReport} report
      **/
     validatorSet: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientValidatorSetReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ValidatorSet';
             params: { report: PalletStakingAsyncRcClientValidatorSetReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7979,16 +7733,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncAhClientOperatingMode} mode
      **/
     setMode: GenericTxCall<
-      Rv,
       (mode: PalletStakingAsyncAhClientOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'SetMode';
             params: { mode: PalletStakingAsyncAhClientOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7997,22 +7750,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnMigrationEnd: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ForceOnMigrationEnd';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Configuration`'s transaction calls
@@ -8024,16 +7776,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeCooldown: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeCooldown';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8043,16 +7794,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8062,16 +7812,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCodeRetentionPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCodeRetentionPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8081,16 +7830,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxCodeSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxCodeSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8100,16 +7848,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxPovSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxPovSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8119,16 +7866,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxHeadDataSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxHeadDataSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8141,16 +7887,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCoretimeCores: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCoretimeCores';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8160,16 +7905,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setGroupRotationFrequency: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetGroupRotationFrequency';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8179,16 +7923,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setParasAvailabilityPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetParasAvailabilityPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8198,16 +7941,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setSchedulingLookahead: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulingLookahead';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8217,16 +7959,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidatorsPerCore: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidatorsPerCore';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8236,16 +7977,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidators: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidators';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8255,16 +7995,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8274,16 +8013,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePostConclusionAcceptancePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePostConclusionAcceptancePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8294,16 +8032,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNoShowSlots: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNoShowSlots';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8313,16 +8050,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNDelayTranches: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNDelayTranches';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8332,16 +8068,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setZerothDelayTrancheWidth: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetZerothDelayTrancheWidth';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8351,16 +8086,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNeededApprovals: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNeededApprovals';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8370,16 +8104,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setRelayVrfModuloSamples: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetRelayVrfModuloSamples';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8389,16 +8122,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8409,16 +8141,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8428,16 +8159,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxDownwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxDownwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8447,16 +8177,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8466,16 +8195,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8485,16 +8213,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpOpenRequestTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpOpenRequestTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8504,16 +8231,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpSenderDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpSenderDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8524,16 +8250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpRecipientDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpRecipientDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8543,16 +8268,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxCapacity: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxCapacity';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8562,16 +8286,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxTotalSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxTotalSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8581,16 +8304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainInboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainInboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8600,16 +8322,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8619,16 +8340,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainOutboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainOutboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8638,16 +8358,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8657,16 +8376,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setPvfVotingTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetPvfVotingTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8679,16 +8397,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8699,16 +8416,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} new_
      **/
     setBypassConsistencyCheck: GenericTxCall<
-      Rv,
       (new_: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetBypassConsistencyCheck';
             params: { new: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8718,16 +8434,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8AsyncBackingAsyncBackingParams} new_
      **/
     setAsyncBackingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetAsyncBackingParams';
             params: { new: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8737,16 +8452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ExecutorParams} new_
      **/
     setExecutorParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ExecutorParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetExecutorParams';
             params: { new: PolkadotPrimitivesV8ExecutorParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8756,16 +8470,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setOnDemandBaseFee: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandBaseFee';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8775,16 +8488,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandFeeVariability: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandFeeVariability';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8794,16 +8506,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setOnDemandQueueMaxSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandQueueMaxSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8813,16 +8524,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandTargetQueueUtilization: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandTargetQueueUtilization';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8832,16 +8542,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumBackingVotes: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumBackingVotes';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8852,19 +8561,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     setNodeFeature: GenericTxCall<
-      Rv,
       (
         index: number,
         value: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNodeFeature';
             params: { index: number; value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8874,16 +8582,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ApprovalVotingParams} new_
      **/
     setApprovalVotingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ApprovalVotingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetApprovalVotingParams';
             params: { new: PolkadotPrimitivesV8ApprovalVotingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8893,23 +8600,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8SchedulerParams} new_
      **/
     setSchedulerParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8SchedulerParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulerParams';
             params: { new: PolkadotPrimitivesV8SchedulerParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasShared`'s transaction calls
@@ -8918,7 +8624,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInclusion`'s transaction calls
@@ -8927,7 +8633,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInherent`'s transaction calls
@@ -8939,23 +8645,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesVstagingInherentData} data
      **/
     enter: GenericTxCall<
-      Rv,
       (data: PolkadotPrimitivesVstagingInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaInherent';
           palletCall: {
             name: 'Enter';
             params: { data: PolkadotPrimitivesVstagingInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Paras`'s transaction calls
@@ -8968,12 +8673,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     forceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -8983,7 +8686,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8994,12 +8698,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceSetCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9009,7 +8711,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9021,13 +8724,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} relayParentNumber
      **/
     forceScheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
         relayParentNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9038,7 +8739,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               relayParentNumber: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9049,12 +8751,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceNoteNewHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9064,7 +8764,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9076,16 +8777,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     forceQueueAction: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceQueueAction';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9108,16 +8808,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     addTrustedValidationCode: GenericTxCall<
-      Rv,
       (validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'AddTrustedValidationCode';
             params: { validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9131,16 +8830,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} validationCodeHash
      **/
     pokeUnusedValidationCode: GenericTxCall<
-      Rv,
       (validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'PokeUnusedValidationCode';
             params: { validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9152,12 +8850,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     includePvfCheckStatement: GenericTxCall<
-      Rv,
       (
         stmt: PolkadotPrimitivesV8PvfCheckStatement,
         signature: PolkadotPrimitivesV8ValidatorAppSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9167,7 +8863,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: PolkadotPrimitivesV8ValidatorAppSignature;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9178,19 +8875,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} context
      **/
     forceSetMostRecentContext: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         context: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceSetMostRecentContext';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; context: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9203,16 +8899,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeUpgradeCooldown: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'RemoveUpgradeCooldown';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9234,13 +8929,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} validPeriod
      **/
     authorizeForceSetCurrentCodeHash: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
         validPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9251,7 +8944,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validPeriod: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9263,12 +8957,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     applyAuthorizedForceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -9278,14 +8970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Initializer`'s transaction calls
@@ -9299,23 +8992,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} upTo
      **/
     forceApprove: GenericTxCall<
-      Rv,
       (upTo: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Initializer';
           palletCall: {
             name: 'ForceApprove';
             params: { upTo: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Hrmp`'s transaction calls
@@ -9338,13 +9030,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposedMaxMessageSize
      **/
     hrmpInitOpenChannel: GenericTxCall<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         proposedMaxCapacity: number,
         proposedMaxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -9355,7 +9045,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proposedMaxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9367,16 +9058,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} sender
      **/
     hrmpAcceptOpenChannel: GenericTxCall<
-      Rv,
       (sender: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpAcceptOpenChannel';
             params: { sender: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9389,16 +9079,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHrmpChannelId} channelId
      **/
     hrmpCloseChannel: GenericTxCall<
-      Rv,
       (channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCloseChannel';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9416,20 +9105,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numOutbound
      **/
     forceCleanHrmp: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         numInbound: number,
         numOutbound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceCleanHrmp';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; numInbound: number; numOutbound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9446,16 +9134,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpOpen: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpOpen';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9472,16 +9159,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpClose: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpClose';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9499,19 +9185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} openRequests
      **/
     hrmpCancelOpenRequest: GenericTxCall<
-      Rv,
       (
         channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
         openRequests: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCancelOpenRequest';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId; openRequests: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9531,14 +9216,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     forceOpenHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -9550,7 +9233,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9572,12 +9256,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     establishSystemChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -9587,7 +9269,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9606,12 +9289,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     pokeChannelDeposits: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -9621,7 +9302,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9637,23 +9319,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} targetSystemChain
      **/
     establishChannelWithSystem: GenericTxCall<
-      Rv,
       (targetSystemChain: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'EstablishChannelWithSystem';
             params: { targetSystemChain: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasDisputes`'s transaction calls
@@ -9663,20 +9344,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceUnfreeze: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasDisputes';
           palletCall: 'ForceUnfreeze';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasSlashing`'s transaction calls
@@ -9688,26 +9368,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDisputeLostUnsigned: GenericTxCall<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesVstagingDisputeProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSlashing';
           palletCall: {
             name: 'ReportDisputeLostUnsigned';
             params: { disputeProof: PolkadotPrimitivesVstagingDisputeProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s transaction calls
@@ -9736,19 +9415,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderAllowDeath: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderAllowDeath';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9775,19 +9453,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderKeepAlive: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderKeepAlive';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9814,26 +9491,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     placeOrderWithCredits: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderWithCredits';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Registrar`'s transaction calls
@@ -9866,13 +9542,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     register: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -9883,7 +9557,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9902,7 +9577,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     forceRegister: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         deposit: bigint,
@@ -9910,7 +9584,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -9923,7 +9596,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9936,16 +9610,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     deregister: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Deregister';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9967,19 +9640,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} other
      **/
     swap: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         other: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Swap';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; other: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9992,16 +9664,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'RemoveLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10026,15 +9697,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     reserve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Reserve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10048,16 +9718,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     addLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'AddLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10078,12 +9747,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     scheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -10093,7 +9760,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10107,12 +9775,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     setCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -10122,14 +9788,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Slots`'s transaction calls
@@ -10148,7 +9815,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} periodCount
      **/
     forceLease: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         leaser: AccountId32Like,
@@ -10156,7 +9822,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         periodBegin: number,
         periodCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
@@ -10169,7 +9834,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               periodCount: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10181,16 +9847,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     clearAllLeases: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'ClearAllLeases';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10206,23 +9871,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     triggerOnboard: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'TriggerOnboard';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Auctions`'s transaction calls
@@ -10239,19 +9903,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} leasePeriodIndex
      **/
     newAuction: GenericTxCall<
-      Rv,
       (
         duration: number,
         leasePeriodIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'NewAuction';
             params: { duration: number; leasePeriodIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10280,7 +9943,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     bid: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         auctionIndex: number,
@@ -10288,7 +9950,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         lastSlot: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
@@ -10301,7 +9962,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10312,22 +9974,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelAuction: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'CancelAuction';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Crowdloan`'s transaction calls
@@ -10348,7 +10009,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     create: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -10357,7 +10017,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -10371,7 +10030,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10384,13 +10044,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contribute: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         value: bigint,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -10401,7 +10059,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: SpRuntimeMultiSignature | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10428,19 +10087,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         index: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Withdraw';
             params: { who: AccountId32Like; index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10454,16 +10112,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     refund: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Refund';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10473,16 +10130,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     dissolve: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Dissolve';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10499,7 +10155,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     edit: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -10508,7 +10163,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -10522,7 +10176,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10535,19 +10190,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} memo
      **/
     addMemo: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         memo: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'AddMemo';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; memo: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10559,16 +10213,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     poke: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Poke';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10581,26 +10234,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contributeAll: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'ContributeAll';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Coretime`'s transaction calls
@@ -10617,16 +10269,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} count
      **/
     requestCoreCount: GenericTxCall<
-      Rv,
       (count: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestCoreCount';
             params: { count: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10639,16 +10290,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     requestRevenueAt: GenericTxCall<
-      Rv,
       (when: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestRevenueAt';
             params: { when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10658,19 +10308,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     creditAccount: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'CreditAccount';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10691,7 +10340,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} endHint
      **/
     assignCore: GenericTxCall<
-      Rv,
       (
         core: number,
         begin: number,
@@ -10700,7 +10348,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         >,
         endHint: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
@@ -10714,14 +10361,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               endHint: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmPallet`'s transaction calls
@@ -10733,19 +10381,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10777,14 +10424,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10796,7 +10441,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10840,14 +10486,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10859,7 +10503,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10877,19 +10522,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10905,19 +10549,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10931,16 +10574,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10953,16 +10595,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10977,16 +10618,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11029,7 +10669,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11037,7 +10676,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -11050,7 +10688,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11081,7 +10720,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11089,7 +10727,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -11102,7 +10739,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11115,16 +10753,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11170,7 +10807,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11178,7 +10814,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -11191,7 +10826,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11207,19 +10843,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11282,7 +10917,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -11292,7 +10926,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -11307,7 +10940,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11328,19 +10962,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11351,16 +10984,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11370,22 +11002,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -11398,19 +11029,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11435,14 +11065,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -11454,14 +11082,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -11477,19 +11106,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11503,19 +11131,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11528,23 +11155,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Beefy`'s transaction calls
@@ -11560,19 +11186,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVoting';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11591,19 +11216,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11616,16 +11240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayInBlocks
      **/
     setNewGenesis: GenericTxCall<
-      Rv,
       (delayInBlocks: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'SetNewGenesis';
             params: { delayInBlocks: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11638,19 +11261,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVoting';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11668,19 +11290,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11693,12 +11314,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11708,7 +11327,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11726,12 +11346,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11741,14 +11359,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RcMigrator`'s transaction calls
@@ -11763,16 +11382,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletRcMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletRcMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11805,14 +11423,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} unsafeIgnoreStakingLockCheck
      **/
     scheduleMigration: GenericTxCall<
-      Rv,
       (
         start: FrameSupportScheduleDispatchTime,
         warmUp: FrameSupportScheduleDispatchTime,
         coolOff: FrameSupportScheduleDispatchTime,
         unsafeIgnoreStakingLockCheck: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
@@ -11824,7 +11440,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               unsafeIgnoreStakingLockCheck: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11836,15 +11453,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startDataMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'StartDataMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11855,19 +11471,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Response} response
      **/
     receiveQueryResponse: GenericTxCall<
-      Rv,
       (
         queryId: bigint,
         response: StagingXcmV5Response,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ReceiveQueryResponse';
             params: { queryId: bigint; response: StagingXcmV5Response };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11877,16 +11492,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} queryId
      **/
     resendXcm: GenericTxCall<
-      Rv,
       (queryId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ResendXcm';
             params: { queryId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11898,16 +11512,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setUnprocessedMsgBuffer: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetUnprocessedMsgBuffer';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11919,16 +11532,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setAhUmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetAhUmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11941,16 +11553,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11963,19 +11574,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11987,16 +11597,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} accounts
      **/
     preserveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PreserveAccounts';
             params: { accounts: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12008,16 +11617,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setCanceller: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetCanceller';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12026,15 +11634,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pauseMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PauseMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12045,15 +11652,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'CancelMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12072,25 +11678,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature} sig
      **/
     voteManagerMultisig: GenericTxCall<
-      Rv,
       (
         payload: PalletRcMigratorManagerMultisigVote,
         sig: SpRuntimeMultiSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'VoteManagerMultisig';
             params: { payload: PalletRcMigratorManagerMultisigVote; sig: SpRuntimeMultiSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/kusama/view-functions.d.ts b/packages/chaintypes/src/kusama/view-functions.d.ts
index eece1e7e..e813f754 100644
--- a/packages/chaintypes/src/kusama/view-functions.d.ts
+++ b/packages/chaintypes/src/kusama/view-functions.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type {
   StagingKusamaRuntimeRuntimeCallLike,
@@ -8,7 +8,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -20,7 +20,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {KusamaRuntimeConstantsProxyProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: StagingKusamaRuntimeRuntimeCallLike, proxyType: KusamaRuntimeConstantsProxyProxyType) => Promise<boolean>
     >;
 
@@ -31,14 +30,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {KusamaRuntimeConstantsProxyProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: KusamaRuntimeConstantsProxyProxyType, against: KusamaRuntimeConstantsProxyProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -55,12 +53,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `Paras`'s view functions
@@ -71,14 +69,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
-    removeUpgradeCooldownCost: GenericViewFunction<
-      Rv,
-      (para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>
-    >;
+    removeUpgradeCooldownCost: GenericViewFunction<(para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/consts.d.ts b/packages/chaintypes/src/moonbeam/consts.d.ts
index 6cd39496..bafe257a 100644
--- a/packages/chaintypes/src/moonbeam/consts.d.ts
+++ b/packages/chaintypes/src/moonbeam/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, AccountId20, Perbill, Bytes } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -14,7 +14,7 @@ import type {
   StagingXcmV5Location,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/moonbeam/errors.d.ts b/packages/chaintypes/src/moonbeam/errors.d.ts
index 920f078d..38f9c43b 100644
--- a/packages/chaintypes/src/moonbeam/errors.d.ts
+++ b/packages/chaintypes/src/moonbeam/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -108,132 +108,132 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainStaking`'s errors
    **/
   parachainStaking: {
-    DelegatorDNE: GenericPalletError<Rv>;
-    DelegatorDNEinTopNorBottom: GenericPalletError<Rv>;
-    DelegatorDNEInDelegatorSet: GenericPalletError<Rv>;
-    CandidateDNE: GenericPalletError<Rv>;
-    DelegationDNE: GenericPalletError<Rv>;
-    DelegatorExists: GenericPalletError<Rv>;
-    CandidateExists: GenericPalletError<Rv>;
-    CandidateBondBelowMin: GenericPalletError<Rv>;
-    InsufficientBalance: GenericPalletError<Rv>;
-    DelegatorBondBelowMin: GenericPalletError<Rv>;
-    DelegationBelowMin: GenericPalletError<Rv>;
-    AlreadyOffline: GenericPalletError<Rv>;
-    AlreadyActive: GenericPalletError<Rv>;
-    DelegatorAlreadyLeaving: GenericPalletError<Rv>;
-    DelegatorNotLeaving: GenericPalletError<Rv>;
-    DelegatorCannotLeaveYet: GenericPalletError<Rv>;
-    CannotDelegateIfLeaving: GenericPalletError<Rv>;
-    CandidateAlreadyLeaving: GenericPalletError<Rv>;
-    CandidateNotLeaving: GenericPalletError<Rv>;
-    CandidateCannotLeaveYet: GenericPalletError<Rv>;
-    CannotGoOnlineIfLeaving: GenericPalletError<Rv>;
-    ExceedMaxDelegationsPerDelegator: GenericPalletError<Rv>;
-    AlreadyDelegatedCandidate: GenericPalletError<Rv>;
-    InvalidSchedule: GenericPalletError<Rv>;
-    CannotSetBelowMin: GenericPalletError<Rv>;
-    RoundLengthMustBeGreaterThanTotalSelectedCollators: GenericPalletError<Rv>;
-    NoWritingSameValue: GenericPalletError<Rv>;
-    TotalInflationDistributionPercentExceeds100: GenericPalletError<Rv>;
-    TooLowCandidateCountWeightHintJoinCandidates: GenericPalletError<Rv>;
-    TooLowCandidateCountWeightHintCancelLeaveCandidates: GenericPalletError<Rv>;
-    TooLowCandidateCountToLeaveCandidates: GenericPalletError<Rv>;
-    TooLowDelegationCountToDelegate: GenericPalletError<Rv>;
-    TooLowCandidateDelegationCountToDelegate: GenericPalletError<Rv>;
-    TooLowCandidateDelegationCountToLeaveCandidates: GenericPalletError<Rv>;
-    TooLowDelegationCountToLeaveDelegators: GenericPalletError<Rv>;
-    PendingCandidateRequestsDNE: GenericPalletError<Rv>;
-    PendingCandidateRequestAlreadyExists: GenericPalletError<Rv>;
-    PendingCandidateRequestNotDueYet: GenericPalletError<Rv>;
-    PendingDelegationRequestDNE: GenericPalletError<Rv>;
-    PendingDelegationRequestAlreadyExists: GenericPalletError<Rv>;
-    PendingDelegationRequestNotDueYet: GenericPalletError<Rv>;
-    CannotDelegateLessThanOrEqualToLowestBottomWhenFull: GenericPalletError<Rv>;
-    PendingDelegationRevoke: GenericPalletError<Rv>;
-    TooLowDelegationCountToAutoCompound: GenericPalletError<Rv>;
-    TooLowCandidateAutoCompoundingDelegationCountToAutoCompound: GenericPalletError<Rv>;
-    TooLowCandidateAutoCompoundingDelegationCountToDelegate: GenericPalletError<Rv>;
-    TooLowCollatorCountToNotifyAsInactive: GenericPalletError<Rv>;
-    CannotBeNotifiedAsInactive: GenericPalletError<Rv>;
-    TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates: GenericPalletError<Rv>;
-    TooLowCandidateCountWeightHint: GenericPalletError<Rv>;
-    TooLowCandidateCountWeightHintGoOffline: GenericPalletError<Rv>;
-    CandidateLimitReached: GenericPalletError<Rv>;
-    CannotSetAboveMaxCandidates: GenericPalletError<Rv>;
-    MarkingOfflineNotEnabled: GenericPalletError<Rv>;
-    CurrentRoundTooLow: GenericPalletError<Rv>;
+    DelegatorDNE: GenericPalletError;
+    DelegatorDNEinTopNorBottom: GenericPalletError;
+    DelegatorDNEInDelegatorSet: GenericPalletError;
+    CandidateDNE: GenericPalletError;
+    DelegationDNE: GenericPalletError;
+    DelegatorExists: GenericPalletError;
+    CandidateExists: GenericPalletError;
+    CandidateBondBelowMin: GenericPalletError;
+    InsufficientBalance: GenericPalletError;
+    DelegatorBondBelowMin: GenericPalletError;
+    DelegationBelowMin: GenericPalletError;
+    AlreadyOffline: GenericPalletError;
+    AlreadyActive: GenericPalletError;
+    DelegatorAlreadyLeaving: GenericPalletError;
+    DelegatorNotLeaving: GenericPalletError;
+    DelegatorCannotLeaveYet: GenericPalletError;
+    CannotDelegateIfLeaving: GenericPalletError;
+    CandidateAlreadyLeaving: GenericPalletError;
+    CandidateNotLeaving: GenericPalletError;
+    CandidateCannotLeaveYet: GenericPalletError;
+    CannotGoOnlineIfLeaving: GenericPalletError;
+    ExceedMaxDelegationsPerDelegator: GenericPalletError;
+    AlreadyDelegatedCandidate: GenericPalletError;
+    InvalidSchedule: GenericPalletError;
+    CannotSetBelowMin: GenericPalletError;
+    RoundLengthMustBeGreaterThanTotalSelectedCollators: GenericPalletError;
+    NoWritingSameValue: GenericPalletError;
+    TotalInflationDistributionPercentExceeds100: GenericPalletError;
+    TooLowCandidateCountWeightHintJoinCandidates: GenericPalletError;
+    TooLowCandidateCountWeightHintCancelLeaveCandidates: GenericPalletError;
+    TooLowCandidateCountToLeaveCandidates: GenericPalletError;
+    TooLowDelegationCountToDelegate: GenericPalletError;
+    TooLowCandidateDelegationCountToDelegate: GenericPalletError;
+    TooLowCandidateDelegationCountToLeaveCandidates: GenericPalletError;
+    TooLowDelegationCountToLeaveDelegators: GenericPalletError;
+    PendingCandidateRequestsDNE: GenericPalletError;
+    PendingCandidateRequestAlreadyExists: GenericPalletError;
+    PendingCandidateRequestNotDueYet: GenericPalletError;
+    PendingDelegationRequestDNE: GenericPalletError;
+    PendingDelegationRequestAlreadyExists: GenericPalletError;
+    PendingDelegationRequestNotDueYet: GenericPalletError;
+    CannotDelegateLessThanOrEqualToLowestBottomWhenFull: GenericPalletError;
+    PendingDelegationRevoke: GenericPalletError;
+    TooLowDelegationCountToAutoCompound: GenericPalletError;
+    TooLowCandidateAutoCompoundingDelegationCountToAutoCompound: GenericPalletError;
+    TooLowCandidateAutoCompoundingDelegationCountToDelegate: GenericPalletError;
+    TooLowCollatorCountToNotifyAsInactive: GenericPalletError;
+    CannotBeNotifiedAsInactive: GenericPalletError;
+    TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates: GenericPalletError;
+    TooLowCandidateCountWeightHint: GenericPalletError;
+    TooLowCandidateCountWeightHintGoOffline: GenericPalletError;
+    CandidateLimitReached: GenericPalletError;
+    CannotSetAboveMaxCandidates: GenericPalletError;
+    MarkingOfflineNotEnabled: GenericPalletError;
+    CurrentRoundTooLow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AuthorInherent`'s errors
@@ -242,22 +242,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Author already set in block.
      **/
-    AuthorAlreadySet: GenericPalletError<Rv>;
+    AuthorAlreadySet: GenericPalletError;
 
     /**
      * No AccountId was found to be associated with this author
      **/
-    NoAccountId: GenericPalletError<Rv>;
+    NoAccountId: GenericPalletError;
 
     /**
      * The author in the inherent is not an eligible author.
      **/
-    CannotBeAuthor: GenericPalletError<Rv>;
+    CannotBeAuthor: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AuthorMapping`'s errors
@@ -266,47 +266,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The association can't be cleared because it is not found.
      **/
-    AssociationNotFound: GenericPalletError<Rv>;
+    AssociationNotFound: GenericPalletError;
 
     /**
      * The association can't be cleared because it belongs to another account.
      **/
-    NotYourAssociation: GenericPalletError<Rv>;
+    NotYourAssociation: GenericPalletError;
 
     /**
      * This account cannot set an author because it cannon afford the security deposit
      **/
-    CannotAffordSecurityDeposit: GenericPalletError<Rv>;
+    CannotAffordSecurityDeposit: GenericPalletError;
 
     /**
      * The NimbusId in question is already associated and cannot be overwritten
      **/
-    AlreadyAssociated: GenericPalletError<Rv>;
+    AlreadyAssociated: GenericPalletError;
 
     /**
      * No existing NimbusId can be found for the account
      **/
-    OldAuthorIdNotFound: GenericPalletError<Rv>;
+    OldAuthorIdNotFound: GenericPalletError;
 
     /**
      * Keys have wrong size
      **/
-    WrongKeySize: GenericPalletError<Rv>;
+    WrongKeySize: GenericPalletError;
 
     /**
      * Failed to decode NimbusId for `set_keys`
      **/
-    DecodeNimbusFailed: GenericPalletError<Rv>;
+    DecodeNimbusFailed: GenericPalletError;
 
     /**
      * Failed to decode T::Keys for `set_keys`
      **/
-    DecodeKeysFailed: GenericPalletError<Rv>;
+    DecodeKeysFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MoonbeamOrbiters`'s errors
@@ -315,53 +315,53 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The collator is already added in orbiters program.
      **/
-    CollatorAlreadyAdded: GenericPalletError<Rv>;
+    CollatorAlreadyAdded: GenericPalletError;
 
     /**
      * This collator is not in orbiters program.
      **/
-    CollatorNotFound: GenericPalletError<Rv>;
+    CollatorNotFound: GenericPalletError;
 
     /**
      * There are already too many orbiters associated with this collator.
      **/
-    CollatorPoolTooLarge: GenericPalletError<Rv>;
+    CollatorPoolTooLarge: GenericPalletError;
 
     /**
      * There are more collator pools than the number specified in the parameter.
      **/
-    CollatorsPoolCountTooLow: GenericPalletError<Rv>;
+    CollatorsPoolCountTooLow: GenericPalletError;
 
     /**
      * The minimum deposit required to register as an orbiter has not yet been included in the
      * onchain storage
      **/
-    MinOrbiterDepositNotSet: GenericPalletError<Rv>;
+    MinOrbiterDepositNotSet: GenericPalletError;
 
     /**
      * This orbiter is already associated with this collator.
      **/
-    OrbiterAlreadyInPool: GenericPalletError<Rv>;
+    OrbiterAlreadyInPool: GenericPalletError;
 
     /**
      * This orbiter has not made a deposit
      **/
-    OrbiterDepositNotFound: GenericPalletError<Rv>;
+    OrbiterDepositNotFound: GenericPalletError;
 
     /**
      * This orbiter is not found
      **/
-    OrbiterNotFound: GenericPalletError<Rv>;
+    OrbiterNotFound: GenericPalletError;
 
     /**
      * The orbiter is still at least in one pool
      **/
-    OrbiterStillInAPool: GenericPalletError<Rv>;
+    OrbiterStillInAPool: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -370,12 +370,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -384,47 +384,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MaintenanceMode`'s errors
@@ -433,17 +433,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The chain cannot enter maintenance mode because it is already in maintenance mode
      **/
-    AlreadyInMaintenanceMode: GenericPalletError<Rv>;
+    AlreadyInMaintenanceMode: GenericPalletError;
 
     /**
      * The chain cannot resume normal operation because it is not in maintenance mode
      **/
-    NotInMaintenanceMode: GenericPalletError<Rv>;
+    NotInMaintenanceMode: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -452,158 +452,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -612,78 +612,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MoonbeamLazyMigrations`'s errors
@@ -692,17 +692,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The contract already have metadata
      **/
-    ContractMetadataAlreadySet: GenericPalletError<Rv>;
+    ContractMetadataAlreadySet: GenericPalletError;
 
     /**
      * Contract not exist
      **/
-    ContractNotExist: GenericPalletError<Rv>;
+    ContractNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVM`'s errors
@@ -711,77 +711,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not enough balance to perform action
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * Calculating total fee overflowed
      **/
-    FeeOverflow: GenericPalletError<Rv>;
+    FeeOverflow: GenericPalletError;
 
     /**
      * Calculating total payment overflowed
      **/
-    PaymentOverflow: GenericPalletError<Rv>;
+    PaymentOverflow: GenericPalletError;
 
     /**
      * Withdraw fee failed
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Gas price is too low.
      **/
-    GasPriceTooLow: GenericPalletError<Rv>;
+    GasPriceTooLow: GenericPalletError;
 
     /**
      * Nonce is invalid
      **/
-    InvalidNonce: GenericPalletError<Rv>;
+    InvalidNonce: GenericPalletError;
 
     /**
      * Gas limit is too low.
      **/
-    GasLimitTooLow: GenericPalletError<Rv>;
+    GasLimitTooLow: GenericPalletError;
 
     /**
      * Gas limit is too high.
      **/
-    GasLimitTooHigh: GenericPalletError<Rv>;
+    GasLimitTooHigh: GenericPalletError;
 
     /**
      * The chain id is invalid.
      **/
-    InvalidChainId: GenericPalletError<Rv>;
+    InvalidChainId: GenericPalletError;
 
     /**
      * the signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * EVM reentrancy
      **/
-    Reentrancy: GenericPalletError<Rv>;
+    Reentrancy: GenericPalletError;
 
     /**
      * EIP-3607,
      **/
-    TransactionMustComeFromEOA: GenericPalletError<Rv>;
+    TransactionMustComeFromEOA: GenericPalletError;
 
     /**
      * Undefined error.
      **/
-    Undefined: GenericPalletError<Rv>;
+    Undefined: GenericPalletError;
 
     /**
      * Address not allowed to deploy contracts either via CREATE or CALL(CREATE).
      **/
-    CreateOriginNotAllowed: GenericPalletError<Rv>;
+    CreateOriginNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Ethereum`'s errors
@@ -790,17 +790,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Pre-log is present, therefore transact is not allowed.
      **/
-    PreLogExists: GenericPalletError<Rv>;
+    PreLogExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -809,32 +809,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -843,47 +843,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -892,68 +892,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -962,77 +962,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -1041,32 +1041,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TreasuryCouncilCollective`'s errors
@@ -1075,67 +1075,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OpenTechCommitteeCollective`'s errors
@@ -1144,67 +1144,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -1213,63 +1213,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CrowdloanRewards`'s errors
@@ -1279,86 +1279,86 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * User trying to associate a native identity with a relay chain identity for posterior
      * reward claiming provided an already associated relay chain identity
      **/
-    AlreadyAssociated: GenericPalletError<Rv>;
+    AlreadyAssociated: GenericPalletError;
 
     /**
      * Trying to introduce a batch that goes beyond the limits of the funds
      **/
-    BatchBeyondFundPot: GenericPalletError<Rv>;
+    BatchBeyondFundPot: GenericPalletError;
 
     /**
      * First claim already done
      **/
-    FirstClaimAlreadyDone: GenericPalletError<Rv>;
+    FirstClaimAlreadyDone: GenericPalletError;
 
     /**
      * The contribution is not high enough to be eligible for rewards
      **/
-    RewardNotHighEnough: GenericPalletError<Rv>;
+    RewardNotHighEnough: GenericPalletError;
 
     /**
      * User trying to associate a native identity with a relay chain identity for posterior
      * reward claiming provided a wrong signature
      **/
-    InvalidClaimSignature: GenericPalletError<Rv>;
+    InvalidClaimSignature: GenericPalletError;
 
     /**
      * User trying to claim the first free reward provided the wrong signature
      **/
-    InvalidFreeClaimSignature: GenericPalletError<Rv>;
+    InvalidFreeClaimSignature: GenericPalletError;
 
     /**
      * User trying to claim an award did not have an claim associated with it. This may mean
      * they did not contribute to the crowdloan, or they have not yet associated a native id
      * with their contribution
      **/
-    NoAssociatedClaim: GenericPalletError<Rv>;
+    NoAssociatedClaim: GenericPalletError;
 
     /**
      * User trying to claim rewards has already claimed all rewards associated with its
      * identity and contribution
      **/
-    RewardsAlreadyClaimed: GenericPalletError<Rv>;
+    RewardsAlreadyClaimed: GenericPalletError;
 
     /**
      * Reward vec has already been initialized
      **/
-    RewardVecAlreadyInitialized: GenericPalletError<Rv>;
+    RewardVecAlreadyInitialized: GenericPalletError;
 
     /**
      * Reward vec has not yet been fully initialized
      **/
-    RewardVecNotFullyInitializedYet: GenericPalletError<Rv>;
+    RewardVecNotFullyInitializedYet: GenericPalletError;
 
     /**
      * Rewards should match funds of the pallet
      **/
-    RewardsDoNotMatchFund: GenericPalletError<Rv>;
+    RewardsDoNotMatchFund: GenericPalletError;
 
     /**
      * Initialize_reward_vec received too many contributors
      **/
-    TooManyContributors: GenericPalletError<Rv>;
+    TooManyContributors: GenericPalletError;
 
     /**
      * Provided vesting period is not valid
      **/
-    VestingPeriodNonValid: GenericPalletError<Rv>;
+    VestingPeriodNonValid: GenericPalletError;
 
     /**
      * User provided a signature from a non-contributor relay account
      **/
-    NonContributedAddressProvided: GenericPalletError<Rv>;
+    NonContributedAddressProvided: GenericPalletError;
 
     /**
      * User submitted an unsifficient number of proofs to change the reward address
      **/
-    InsufficientNumberOfValidProofs: GenericPalletError<Rv>;
+    InsufficientNumberOfValidProofs: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -1367,32 +1367,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -1402,144 +1402,144 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -1548,162 +1548,162 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmTransactor`'s errors
    **/
   xcmTransactor: {
-    IndexAlreadyClaimed: GenericPalletError<Rv>;
-    UnclaimedIndex: GenericPalletError<Rv>;
-    NotOwner: GenericPalletError<Rv>;
-    UnweighableMessage: GenericPalletError<Rv>;
-    CannotReanchor: GenericPalletError<Rv>;
-    AssetHasNoReserve: GenericPalletError<Rv>;
-    InvalidDest: GenericPalletError<Rv>;
-    NotCrossChainTransfer: GenericPalletError<Rv>;
-    AssetIsNotReserveInDestination: GenericPalletError<Rv>;
-    DestinationNotInvertible: GenericPalletError<Rv>;
-    ErrorDelivering: GenericPalletError<Rv>;
-    DispatchWeightBiggerThanTotalWeight: GenericPalletError<Rv>;
-    WeightOverflow: GenericPalletError<Rv>;
-    AmountOverflow: GenericPalletError<Rv>;
-    TransactorInfoNotSet: GenericPalletError<Rv>;
-    NotCrossChainTransferableCurrency: GenericPalletError<Rv>;
-    XcmExecuteError: GenericPalletError<Rv>;
-    BadVersion: GenericPalletError<Rv>;
-    MaxWeightTransactReached: GenericPalletError<Rv>;
-    UnableToWithdrawAsset: GenericPalletError<Rv>;
-    FeePerSecondNotSet: GenericPalletError<Rv>;
-    SignedTransactNotAllowedForDestination: GenericPalletError<Rv>;
-    FailedMultiLocationToJunction: GenericPalletError<Rv>;
-    HrmpHandlerNotImplemented: GenericPalletError<Rv>;
-    TooMuchFeeUsed: GenericPalletError<Rv>;
-    ErrorValidating: GenericPalletError<Rv>;
-    RefundNotSupportedWithTransactInfo: GenericPalletError<Rv>;
+    IndexAlreadyClaimed: GenericPalletError;
+    UnclaimedIndex: GenericPalletError;
+    NotOwner: GenericPalletError;
+    UnweighableMessage: GenericPalletError;
+    CannotReanchor: GenericPalletError;
+    AssetHasNoReserve: GenericPalletError;
+    InvalidDest: GenericPalletError;
+    NotCrossChainTransfer: GenericPalletError;
+    AssetIsNotReserveInDestination: GenericPalletError;
+    DestinationNotInvertible: GenericPalletError;
+    ErrorDelivering: GenericPalletError;
+    DispatchWeightBiggerThanTotalWeight: GenericPalletError;
+    WeightOverflow: GenericPalletError;
+    AmountOverflow: GenericPalletError;
+    TransactorInfoNotSet: GenericPalletError;
+    NotCrossChainTransferableCurrency: GenericPalletError;
+    XcmExecuteError: GenericPalletError;
+    BadVersion: GenericPalletError;
+    MaxWeightTransactReached: GenericPalletError;
+    UnableToWithdrawAsset: GenericPalletError;
+    FeePerSecondNotSet: GenericPalletError;
+    SignedTransactNotAllowedForDestination: GenericPalletError;
+    FailedMultiLocationToJunction: GenericPalletError;
+    HrmpHandlerNotImplemented: GenericPalletError;
+    TooMuchFeeUsed: GenericPalletError;
+    ErrorValidating: GenericPalletError;
+    RefundNotSupportedWithTransactInfo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EthereumXcm`'s errors
@@ -1712,12 +1712,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Xcm to Ethereum execution is suspended
      **/
-    EthereumXcmExecutionSuspended: GenericPalletError<Rv>;
+    EthereumXcmExecutionSuspended: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -1727,32 +1727,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -1760,58 +1760,58 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EvmForeignAssets`'s errors
    **/
   evmForeignAssets: {
-    AssetAlreadyExists: GenericPalletError<Rv>;
-    AssetAlreadyFrozen: GenericPalletError<Rv>;
-    AssetDoesNotExist: GenericPalletError<Rv>;
-    AssetIdFiltered: GenericPalletError<Rv>;
-    AssetNotFrozen: GenericPalletError<Rv>;
-    CorruptedStorageOrphanLocation: GenericPalletError<Rv>;
-    Erc20ContractCreationFail: GenericPalletError<Rv>;
-    EvmCallPauseFail: GenericPalletError<Rv>;
-    EvmCallUnpauseFail: GenericPalletError<Rv>;
-    EvmCallMintIntoFail: GenericPalletError<Rv>;
-    EvmCallTransferFail: GenericPalletError<Rv>;
-    EvmInternalError: GenericPalletError<Rv>;
+    AssetAlreadyExists: GenericPalletError;
+    AssetAlreadyFrozen: GenericPalletError;
+    AssetDoesNotExist: GenericPalletError;
+    AssetIdFiltered: GenericPalletError;
+    AssetNotFrozen: GenericPalletError;
+    CorruptedStorageOrphanLocation: GenericPalletError;
+    Erc20ContractCreationFail: GenericPalletError;
+    EvmCallPauseFail: GenericPalletError;
+    EvmCallUnpauseFail: GenericPalletError;
+    EvmCallMintIntoFail: GenericPalletError;
+    EvmCallTransferFail: GenericPalletError;
+    EvmInternalError: GenericPalletError;
 
     /**
      * Account has insufficient balance for locking
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
-    CannotConvertLocationToAccount: GenericPalletError<Rv>;
-    LocationOutsideOfOrigin: GenericPalletError<Rv>;
-    AssetNotInSiblingPara: GenericPalletError<Rv>;
-    InvalidSymbol: GenericPalletError<Rv>;
-    InvalidTokenName: GenericPalletError<Rv>;
-    LocationAlreadyExists: GenericPalletError<Rv>;
-    TooManyForeignAssets: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
+    CannotConvertLocationToAccount: GenericPalletError;
+    LocationOutsideOfOrigin: GenericPalletError;
+    AssetNotInSiblingPara: GenericPalletError;
+    InvalidSymbol: GenericPalletError;
+    InvalidTokenName: GenericPalletError;
+    LocationAlreadyExists: GenericPalletError;
+    TooManyForeignAssets: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmWeightTrader`'s errors
@@ -1820,42 +1820,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset was already added
      **/
-    AssetAlreadyAdded: GenericPalletError<Rv>;
+    AssetAlreadyAdded: GenericPalletError;
 
     /**
      * The given asset was already paused
      **/
-    AssetAlreadyPaused: GenericPalletError<Rv>;
+    AssetAlreadyPaused: GenericPalletError;
 
     /**
      * The given asset was not found
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * The given asset is not paused
      **/
-    AssetNotPaused: GenericPalletError<Rv>;
+    AssetNotPaused: GenericPalletError;
 
     /**
      * XCM location filtered
      **/
-    XcmLocationFiltered: GenericPalletError<Rv>;
+    XcmLocationFiltered: GenericPalletError;
 
     /**
      * The relative price cannot be zero
      **/
-    PriceCannotBeZero: GenericPalletError<Rv>;
+    PriceCannotBeZero: GenericPalletError;
 
     /**
      * The relative price calculation overflowed
      **/
-    PriceOverflow: GenericPalletError<Rv>;
+    PriceOverflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EmergencyParaXcm`'s errors
@@ -1864,12 +1864,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The current XCM Mode is not Paused
      **/
-    NotInPausedMode: GenericPalletError<Rv>;
+    NotInPausedMode: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -1878,34 +1878,34 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Randomness`'s errors
    **/
   randomness: {
-    RequestCounterOverflowed: GenericPalletError<Rv>;
-    RequestFeeOverflowed: GenericPalletError<Rv>;
-    MustRequestAtLeastOneWord: GenericPalletError<Rv>;
-    CannotRequestMoreWordsThanMax: GenericPalletError<Rv>;
-    CannotRequestRandomnessAfterMaxDelay: GenericPalletError<Rv>;
-    CannotRequestRandomnessBeforeMinDelay: GenericPalletError<Rv>;
-    RequestDNE: GenericPalletError<Rv>;
-    RequestCannotYetBeFulfilled: GenericPalletError<Rv>;
-    OnlyRequesterCanIncreaseFee: GenericPalletError<Rv>;
-    RequestHasNotExpired: GenericPalletError<Rv>;
-    RandomnessResultDNE: GenericPalletError<Rv>;
-    RandomnessResultNotFilled: GenericPalletError<Rv>;
+    RequestCounterOverflowed: GenericPalletError;
+    RequestFeeOverflowed: GenericPalletError;
+    MustRequestAtLeastOneWord: GenericPalletError;
+    CannotRequestMoreWordsThanMax: GenericPalletError;
+    CannotRequestRandomnessAfterMaxDelay: GenericPalletError;
+    CannotRequestRandomnessBeforeMinDelay: GenericPalletError;
+    RequestDNE: GenericPalletError;
+    RequestCannotYetBeFulfilled: GenericPalletError;
+    OnlyRequesterCanIncreaseFee: GenericPalletError;
+    RequestHasNotExpired: GenericPalletError;
+    RandomnessResultDNE: GenericPalletError;
+    RandomnessResultNotFilled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `BridgeKusamaGrandpa`'s errors
@@ -1914,73 +1914,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given justification is invalid for the given header.
      **/
-    InvalidJustification: GenericPalletError<Rv>;
+    InvalidJustification: GenericPalletError;
 
     /**
      * The authority set from the underlying header chain is invalid.
      **/
-    InvalidAuthoritySet: GenericPalletError<Rv>;
+    InvalidAuthoritySet: GenericPalletError;
 
     /**
      * The header being imported is older than the best finalized header known to the pallet.
      **/
-    OldHeader: GenericPalletError<Rv>;
+    OldHeader: GenericPalletError;
 
     /**
      * The scheduled authority set change found in the header is unsupported by the pallet.
      *
      * This is the case for non-standard (e.g forced) authority set changes.
      **/
-    UnsupportedScheduledChange: GenericPalletError<Rv>;
+    UnsupportedScheduledChange: GenericPalletError;
 
     /**
      * The pallet is not yet initialized.
      **/
-    NotInitialized: GenericPalletError<Rv>;
+    NotInitialized: GenericPalletError;
 
     /**
      * The pallet has already been initialized.
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * Too many authorities in the set.
      **/
-    TooManyAuthoritiesInSet: GenericPalletError<Rv>;
+    TooManyAuthoritiesInSet: GenericPalletError;
 
     /**
      * Error generated by the `OwnedBridgeModule` trait.
      **/
-    BridgeModule: GenericPalletError<Rv>;
+    BridgeModule: GenericPalletError;
 
     /**
      * The `current_set_id` argument of the `submit_finality_proof_ex` doesn't match
      * the id of the current set, known to the pallet.
      **/
-    InvalidAuthoritySetId: GenericPalletError<Rv>;
+    InvalidAuthoritySetId: GenericPalletError;
 
     /**
      * The submitter wanted free execution, but we can't fit more free transactions
      * to the block.
      **/
-    FreeHeadersLimitExceded: GenericPalletError<Rv>;
+    FreeHeadersLimitExceded: GenericPalletError;
 
     /**
      * The submitter wanted free execution, but the difference between best known and
      * bundled header numbers is below the `FreeHeadersInterval`.
      **/
-    BelowFreeHeaderInterval: GenericPalletError<Rv>;
+    BelowFreeHeaderInterval: GenericPalletError;
 
     /**
      * The header (and its finality) submission overflows hardcoded chain limits: size
      * and/or weight are larger than expected.
      **/
-    HeaderOverflowLimits: GenericPalletError<Rv>;
+    HeaderOverflowLimits: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `BridgeKusamaParachains`'s errors
@@ -1989,27 +1989,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Relay chain block hash is unknown to us.
      **/
-    UnknownRelayChainBlock: GenericPalletError<Rv>;
+    UnknownRelayChainBlock: GenericPalletError;
 
     /**
      * The number of stored relay block is different from what the relayer has provided.
      **/
-    InvalidRelayChainBlockNumber: GenericPalletError<Rv>;
+    InvalidRelayChainBlockNumber: GenericPalletError;
 
     /**
      * Parachain heads storage proof is invalid.
      **/
-    HeaderChainStorageProof: GenericPalletError<Rv>;
+    HeaderChainStorageProof: GenericPalletError;
 
     /**
      * Error generated by the `OwnedBridgeModule` trait.
      **/
-    BridgeModule: GenericPalletError<Rv>;
+    BridgeModule: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `BridgeKusamaMessages`'s errors
@@ -2018,59 +2018,59 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pallet is not in Normal operating mode.
      **/
-    NotOperatingNormally: GenericPalletError<Rv>;
+    NotOperatingNormally: GenericPalletError;
 
     /**
      * Error that is reported by the lanes manager.
      **/
-    LanesManager: GenericPalletError<Rv>;
+    LanesManager: GenericPalletError;
 
     /**
      * Message has been treated as invalid by the pallet logic.
      **/
-    MessageRejectedByPallet: GenericPalletError<Rv>;
+    MessageRejectedByPallet: GenericPalletError;
 
     /**
      * The transaction brings too many messages.
      **/
-    TooManyMessagesInTheProof: GenericPalletError<Rv>;
+    TooManyMessagesInTheProof: GenericPalletError;
 
     /**
      * Invalid messages has been submitted.
      **/
-    InvalidMessagesProof: GenericPalletError<Rv>;
+    InvalidMessagesProof: GenericPalletError;
 
     /**
      * Invalid messages delivery proof has been submitted.
      **/
-    InvalidMessagesDeliveryProof: GenericPalletError<Rv>;
+    InvalidMessagesDeliveryProof: GenericPalletError;
 
     /**
      * The relayer has declared invalid unrewarded relayers state in the
      * `receive_messages_delivery_proof` call.
      **/
-    InvalidUnrewardedRelayersState: GenericPalletError<Rv>;
+    InvalidUnrewardedRelayersState: GenericPalletError;
 
     /**
      * The cumulative dispatch weight, passed by relayer is not enough to cover dispatch
      * of all bundled messages.
      **/
-    InsufficientDispatchWeight: GenericPalletError<Rv>;
+    InsufficientDispatchWeight: GenericPalletError;
 
     /**
      * Error confirming messages receival.
      **/
-    ReceptionConfirmation: GenericPalletError<Rv>;
+    ReceptionConfirmation: GenericPalletError;
 
     /**
      * Error generated by the `OwnedBridgeModule` trait.
      **/
-    BridgeModule: GenericPalletError<Rv>;
+    BridgeModule: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `BridgeXcmOverMoonriver`'s errors
@@ -2079,51 +2079,51 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Bridge locations error.
      **/
-    BridgeLocations: GenericPalletError<Rv>;
+    BridgeLocations: GenericPalletError;
 
     /**
      * Invalid local bridge origin account.
      **/
-    InvalidBridgeOriginAccount: GenericPalletError<Rv>;
+    InvalidBridgeOriginAccount: GenericPalletError;
 
     /**
      * The bridge is already registered in this pallet.
      **/
-    BridgeAlreadyExists: GenericPalletError<Rv>;
+    BridgeAlreadyExists: GenericPalletError;
 
     /**
      * The local origin already owns a maximal number of bridges.
      **/
-    TooManyBridgesForLocalOrigin: GenericPalletError<Rv>;
+    TooManyBridgesForLocalOrigin: GenericPalletError;
 
     /**
      * Trying to close already closed bridge.
      **/
-    BridgeAlreadyClosed: GenericPalletError<Rv>;
+    BridgeAlreadyClosed: GenericPalletError;
 
     /**
      * Lanes manager error.
      **/
-    LanesManager: GenericPalletError<Rv>;
+    LanesManager: GenericPalletError;
 
     /**
      * Trying to access unknown bridge.
      **/
-    UnknownBridge: GenericPalletError<Rv>;
+    UnknownBridge: GenericPalletError;
 
     /**
      * The bridge origin can't pay the required amount for opening the bridge.
      **/
-    FailedToReserveBridgeDeposit: GenericPalletError<Rv>;
+    FailedToReserveBridgeDeposit: GenericPalletError;
 
     /**
      * The version of XCM location argument is unsupported.
      **/
-    UnsupportedXcmVersion: GenericPalletError<Rv>;
+    UnsupportedXcmVersion: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/events.d.ts b/packages/chaintypes/src/moonbeam/events.d.ts
index ef65b974..887db00e 100644
--- a/packages/chaintypes/src/moonbeam/events.d.ts
+++ b/packages/chaintypes/src/moonbeam/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId20,
@@ -58,7 +58,7 @@ import type {
   StagingXcmV5Junctions,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -66,18 +66,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -86,33 +80,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId20 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId20 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId20 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId20 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId20; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId20; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -121,7 +114,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -130,13 +123,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -145,18 +137,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -166,7 +157,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -175,7 +165,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RootTesting`'s events
@@ -184,12 +174,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Event dispatched when the trigger_defensive extrinsic is called.
      **/
-    DefensiveTestCall: GenericPalletEvent<Rv, 'RootTesting', 'DefensiveTestCall', undefined>;
+    DefensiveTestCall: GenericPalletEvent<'RootTesting', 'DefensiveTestCall', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -198,40 +188,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId20; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId20; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId20; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId20; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId20; to: AccountId20; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId20; to: AccountId20; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId20; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId20; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId20; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId20; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId20; to: AccountId20; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -240,82 +229,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId20; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId20; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId20; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId20; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId20; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId20; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId20; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId20; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId20 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId20 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId20; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId20; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId20; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId20; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId20; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId20; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -326,7 +315,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId20; actualFee: bigint; tip: bigint }
@@ -335,7 +323,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainStaking`'s events
@@ -345,7 +333,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Started new round.
      **/
     NewRound: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'NewRound',
       { startingBlock: number; round: number; selectedCollatorsNumber: number; totalBalance: bigint }
@@ -355,7 +342,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Account joined the set of collator candidates.
      **/
     JoinedCollatorCandidates: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'JoinedCollatorCandidates',
       { account: AccountId20; amountLocked: bigint; newTotalAmtLocked: bigint }
@@ -365,7 +351,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Candidate selected for collators. Total Exposed Amount includes all delegations.
      **/
     CollatorChosen: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CollatorChosen',
       { round: number; collatorAccount: AccountId20; totalExposedAmount: bigint }
@@ -375,7 +360,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Candidate requested to decrease a self bond.
      **/
     CandidateBondLessRequested: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CandidateBondLessRequested',
       { candidate: AccountId20; amountToDecrease: bigint; executeRound: number }
@@ -385,7 +369,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Candidate has increased a self bond.
      **/
     CandidateBondedMore: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CandidateBondedMore',
       { candidate: AccountId20; amount: bigint; newTotalBond: bigint }
@@ -395,7 +378,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Candidate has decreased a self bond.
      **/
     CandidateBondedLess: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CandidateBondedLess',
       { candidate: AccountId20; amount: bigint; newBond: bigint }
@@ -404,23 +386,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Candidate temporarily leave the set of collator candidates without unbonding.
      **/
-    CandidateWentOffline: GenericPalletEvent<
-      Rv,
-      'ParachainStaking',
-      'CandidateWentOffline',
-      { candidate: AccountId20 }
-    >;
+    CandidateWentOffline: GenericPalletEvent<'ParachainStaking', 'CandidateWentOffline', { candidate: AccountId20 }>;
 
     /**
      * Candidate rejoins the set of collator candidates.
      **/
-    CandidateBackOnline: GenericPalletEvent<Rv, 'ParachainStaking', 'CandidateBackOnline', { candidate: AccountId20 }>;
+    CandidateBackOnline: GenericPalletEvent<'ParachainStaking', 'CandidateBackOnline', { candidate: AccountId20 }>;
 
     /**
      * Candidate has requested to leave the set of candidates.
      **/
     CandidateScheduledExit: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CandidateScheduledExit',
       { exitAllowedRound: number; candidate: AccountId20; scheduledExit: number }
@@ -430,7 +406,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancelled request to leave the set of candidates.
      **/
     CancelledCandidateExit: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CancelledCandidateExit',
       { candidate: AccountId20 }
@@ -440,7 +415,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancelled request to decrease candidate's bond.
      **/
     CancelledCandidateBondLess: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CancelledCandidateBondLess',
       { candidate: AccountId20; amount: bigint; executeRound: number }
@@ -450,7 +424,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Candidate has left the set of candidates.
      **/
     CandidateLeft: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CandidateLeft',
       { exCandidate: AccountId20; unlockedAmount: bigint; newTotalAmtLocked: bigint }
@@ -460,19 +433,16 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegator requested to decrease a bond for the collator candidate.
      **/
     DelegationDecreaseScheduled: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationDecreaseScheduled',
       { delegator: AccountId20; candidate: AccountId20; amountToDecrease: bigint; executeRound: number }
     >;
     DelegationIncreased: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationIncreased',
       { delegator: AccountId20; candidate: AccountId20; amount: bigint; inTop: boolean }
     >;
     DelegationDecreased: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationDecreased',
       { delegator: AccountId20; candidate: AccountId20; amount: bigint; inTop: boolean }
@@ -482,7 +452,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegator requested to leave the set of delegators.
      **/
     DelegatorExitScheduled: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegatorExitScheduled',
       { round: number; delegator: AccountId20; scheduledExit: number }
@@ -492,7 +461,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegator requested to revoke delegation.
      **/
     DelegationRevocationScheduled: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationRevocationScheduled',
       { round: number; delegator: AccountId20; candidate: AccountId20; scheduledExit: number }
@@ -502,7 +470,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegator has left the set of delegators.
      **/
     DelegatorLeft: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegatorLeft',
       { delegator: AccountId20; unstakedAmount: bigint }
@@ -512,7 +479,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegation revoked.
      **/
     DelegationRevoked: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationRevoked',
       { delegator: AccountId20; candidate: AccountId20; unstakedAmount: bigint }
@@ -522,7 +488,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegation kicked.
      **/
     DelegationKicked: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegationKicked',
       { delegator: AccountId20; candidate: AccountId20; unstakedAmount: bigint }
@@ -532,7 +497,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancelled a pending request to exit the set of delegators.
      **/
     DelegatorExitCancelled: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegatorExitCancelled',
       { delegator: AccountId20 }
@@ -542,7 +506,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancelled request to change an existing delegation.
      **/
     CancelledDelegationRequest: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CancelledDelegationRequest',
       {
@@ -556,7 +519,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New delegation (increase of the existing one).
      **/
     Delegation: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'Delegation',
       {
@@ -572,7 +534,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delegation from candidate state has been remove.
      **/
     DelegatorLeftCandidate: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'DelegatorLeftCandidate',
       { delegator: AccountId20; candidate: AccountId20; unstakedAmount: bigint; totalCandidateStaked: bigint }
@@ -581,19 +542,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Paid the account (delegator or collator) the balance as liquid rewards.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ParachainStaking', 'Rewarded', { account: AccountId20; rewards: bigint }>;
+    Rewarded: GenericPalletEvent<'ParachainStaking', 'Rewarded', { account: AccountId20; rewards: bigint }>;
 
     /**
      * Transferred to account which holds funds reserved for parachain bond.
      **/
     InflationDistributed: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'InflationDistributed',
       { index: number; account: AccountId20; value: bigint }
     >;
     InflationDistributionConfigUpdated: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'InflationDistributionConfigUpdated',
       { old: PalletParachainStakingInflationDistributionConfig; new: PalletParachainStakingInflationDistributionConfig }
@@ -603,7 +562,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Annual inflation input (first 3) was used to derive new per-round inflation (last 3)
      **/
     InflationSet: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'InflationSet',
       {
@@ -620,7 +578,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Staking expectations set.
      **/
     StakeExpectationsSet: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'StakeExpectationsSet',
       { expectMin: bigint; expectIdeal: bigint; expectMax: bigint }
@@ -629,13 +586,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Set total selected candidates to this value.
      **/
-    TotalSelectedSet: GenericPalletEvent<Rv, 'ParachainStaking', 'TotalSelectedSet', { old: number; new: number }>;
+    TotalSelectedSet: GenericPalletEvent<'ParachainStaking', 'TotalSelectedSet', { old: number; new: number }>;
 
     /**
      * Set collator commission to this value.
      **/
     CollatorCommissionSet: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'CollatorCommissionSet',
       { old: Perbill; new: Perbill }
@@ -645,7 +601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set blocks per round
      **/
     BlocksPerRoundSet: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'BlocksPerRoundSet',
       {
@@ -663,7 +618,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Auto-compounding reward percent was set for a delegation.
      **/
     AutoCompoundSet: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'AutoCompoundSet',
       { candidate: AccountId20; delegator: AccountId20; value: Percent }
@@ -673,7 +627,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Compounded a portion of rewards towards the delegation.
      **/
     Compounded: GenericPalletEvent<
-      Rv,
       'ParachainStaking',
       'Compounded',
       { candidate: AccountId20; delegator: AccountId20; amount: bigint }
@@ -682,7 +635,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AuthorFilter`'s events
@@ -691,12 +644,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The amount of eligible authors for the filter to select has been changed.
      **/
-    EligibleUpdated: GenericPalletEvent<Rv, 'AuthorFilter', 'EligibleUpdated', PalletAuthorSlotFilterNumNonZeroU32>;
+    EligibleUpdated: GenericPalletEvent<'AuthorFilter', 'EligibleUpdated', PalletAuthorSlotFilterNumNonZeroU32>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AuthorMapping`'s events
@@ -706,7 +659,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A NimbusId has been registered and mapped to an AccountId.
      **/
     KeysRegistered: GenericPalletEvent<
-      Rv,
       'AuthorMapping',
       'KeysRegistered',
       {
@@ -720,7 +672,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NimbusId has been de-registered, and its AccountId mapping removed.
      **/
     KeysRemoved: GenericPalletEvent<
-      Rv,
       'AuthorMapping',
       'KeysRemoved',
       {
@@ -734,7 +685,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NimbusId has been registered, replacing a previous registration and its mapping.
      **/
     KeysRotated: GenericPalletEvent<
-      Rv,
       'AuthorMapping',
       'KeysRotated',
       {
@@ -747,7 +697,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MoonbeamOrbiters`'s events
@@ -757,7 +707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An orbiter join a collator pool
      **/
     OrbiterJoinCollatorPool: GenericPalletEvent<
-      Rv,
       'MoonbeamOrbiters',
       'OrbiterJoinCollatorPool',
       { collator: AccountId20; orbiter: AccountId20 }
@@ -767,7 +716,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An orbiter leave a collator pool
      **/
     OrbiterLeaveCollatorPool: GenericPalletEvent<
-      Rv,
       'MoonbeamOrbiters',
       'OrbiterLeaveCollatorPool',
       { collator: AccountId20; orbiter: AccountId20 }
@@ -777,13 +725,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Paid the orbiter account the balance as liquid rewards.
      **/
     OrbiterRewarded: GenericPalletEvent<
-      Rv,
       'MoonbeamOrbiters',
       'OrbiterRewarded',
       { account: AccountId20; rewards: bigint }
     >;
     OrbiterRotation: GenericPalletEvent<
-      Rv,
       'MoonbeamOrbiters',
       'OrbiterRotation',
       { collator: AccountId20; oldOrbiter?: AccountId20 | undefined; newOrbiter?: AccountId20 | undefined }
@@ -793,7 +739,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An orbiter has registered
      **/
     OrbiterRegistered: GenericPalletEvent<
-      Rv,
       'MoonbeamOrbiters',
       'OrbiterRegistered',
       { account: AccountId20; deposit: bigint }
@@ -802,12 +747,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An orbiter has unregistered
      **/
-    OrbiterUnregistered: GenericPalletEvent<Rv, 'MoonbeamOrbiters', 'OrbiterUnregistered', { account: AccountId20 }>;
+    OrbiterUnregistered: GenericPalletEvent<'MoonbeamOrbiters', 'OrbiterUnregistered', { account: AccountId20 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -817,47 +762,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -866,14 +811,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId20; who: AccountId20; proxyType: MoonbeamRuntimeProxyType; disambiguationIndex: number }
@@ -882,13 +826,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId20; proxy: AccountId20; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId20; proxy: AccountId20; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId20; delegatee: AccountId20; proxyType: MoonbeamRuntimeProxyType; delay: number }
@@ -898,7 +841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId20; delegatee: AccountId20; proxyType: MoonbeamRuntimeProxyType; delay: number }
@@ -908,7 +850,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId20; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -917,7 +858,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MaintenanceMode`'s events
@@ -926,18 +867,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The chain was put into Maintenance Mode
      **/
-    EnteredMaintenanceMode: GenericPalletEvent<Rv, 'MaintenanceMode', 'EnteredMaintenanceMode', null>;
+    EnteredMaintenanceMode: GenericPalletEvent<'MaintenanceMode', 'EnteredMaintenanceMode', null>;
 
     /**
      * The chain returned to its normal operating state
      **/
-    NormalOperationResumed: GenericPalletEvent<Rv, 'MaintenanceMode', 'NormalOperationResumed', null>;
+    NormalOperationResumed: GenericPalletEvent<'MaintenanceMode', 'NormalOperationResumed', null>;
 
     /**
      * The call to suspend on_idle XCM execution failed with inner error
      **/
     FailedToSuspendIdleXcmExecution: GenericPalletEvent<
-      Rv,
       'MaintenanceMode',
       'FailedToSuspendIdleXcmExecution',
       { error: DispatchError }
@@ -947,7 +887,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call to resume on_idle XCM execution failed with inner error
      **/
     FailedToResumeIdleXcmExecution: GenericPalletEvent<
-      Rv,
       'MaintenanceMode',
       'FailedToResumeIdleXcmExecution',
       { error: DispatchError }
@@ -956,7 +895,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -965,23 +904,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId20 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId20 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId20; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId20; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId20; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId20; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId20; registrarIndex: number }
@@ -991,7 +929,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId20; registrarIndex: number }
@@ -1000,23 +937,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId20; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId20; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId20; main: AccountId20; deposit: bigint }
@@ -1026,7 +957,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId20; numberOfSubs: number; newDeposit: bigint }
@@ -1035,18 +965,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId20; main: AccountId20 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId20; main: AccountId20 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId20; main: AccountId20; deposit: bigint }
@@ -1057,7 +981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId20; main: AccountId20; deposit: bigint }
@@ -1066,23 +989,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId20 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId20 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId20 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId20 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId20; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId20; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId20; username: Bytes; expiration: number }
@@ -1091,19 +1013,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId20 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId20 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId20; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId20; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId20; username: Bytes }
@@ -1112,22 +1033,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1137,7 +1058,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId20; multisig: AccountId20; callHash: FixedBytes<32> }
@@ -1147,7 +1067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId20; timepoint: PalletMultisigTimepoint; multisig: AccountId20; callHash: FixedBytes<32> }
@@ -1157,7 +1076,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1173,7 +1091,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId20; timepoint: PalletMultisigTimepoint; multisig: AccountId20; callHash: FixedBytes<32> }
@@ -1183,7 +1100,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId20; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1192,7 +1108,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -1204,7 +1120,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -1228,7 +1143,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVM`'s events
@@ -1237,32 +1152,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ethereum events from contracts.
      **/
-    Log: GenericPalletEvent<Rv, 'EVM', 'Log', { log: EthereumLog }>;
+    Log: GenericPalletEvent<'EVM', 'Log', { log: EthereumLog }>;
 
     /**
      * A contract has been created at given address.
      **/
-    Created: GenericPalletEvent<Rv, 'EVM', 'Created', { address: H160 }>;
+    Created: GenericPalletEvent<'EVM', 'Created', { address: H160 }>;
 
     /**
      * A contract was attempted to be created, but the execution failed.
      **/
-    CreatedFailed: GenericPalletEvent<Rv, 'EVM', 'CreatedFailed', { address: H160 }>;
+    CreatedFailed: GenericPalletEvent<'EVM', 'CreatedFailed', { address: H160 }>;
 
     /**
      * A contract has been executed successfully with states applied.
      **/
-    Executed: GenericPalletEvent<Rv, 'EVM', 'Executed', { address: H160 }>;
+    Executed: GenericPalletEvent<'EVM', 'Executed', { address: H160 }>;
 
     /**
      * A contract has been executed with errors. States are reverted with only gas fees applied.
      **/
-    ExecutedFailed: GenericPalletEvent<Rv, 'EVM', 'ExecutedFailed', { address: H160 }>;
+    ExecutedFailed: GenericPalletEvent<'EVM', 'ExecutedFailed', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Ethereum`'s events
@@ -1272,7 +1187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An ethereum transaction was successfully executed.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Ethereum',
       'Executed',
       { from: H160; to: H160; transactionHash: H256; exitReason: EvmCoreErrorExitReason; extraData: Bytes }
@@ -1281,7 +1195,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -1290,18 +1204,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -1311,7 +1224,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1321,7 +1233,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1331,7 +1242,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1341,7 +1251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1352,7 +1261,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1362,7 +1270,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1371,12 +1278,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -1385,22 +1292,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -1409,18 +1316,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId20, AccountId20]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId20, AccountId20]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId20>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId20>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId20; vote: PalletConvictionVotingVoteAccountVote }
@@ -1430,7 +1336,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId20; vote: PalletConvictionVotingVoteAccountVote }
@@ -1439,12 +1344,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId20; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId20; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -1454,7 +1359,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -1479,7 +1383,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -1504,7 +1407,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -1529,7 +1431,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -1549,7 +1450,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -1575,7 +1475,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -1586,7 +1485,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -1601,7 +1499,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -1621,7 +1518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1636,7 +1532,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1656,7 +1551,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1676,7 +1570,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1696,7 +1589,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1716,7 +1608,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1741,7 +1632,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1761,7 +1651,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1780,16 +1669,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1798,7 +1686,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TreasuryCouncilCollective`'s events
@@ -1809,7 +1697,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'Proposed',
       { account: AccountId20; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -1820,7 +1707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'Voted',
       { account: AccountId20; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -1829,18 +1715,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TreasuryCouncilCollective', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TreasuryCouncilCollective', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TreasuryCouncilCollective', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TreasuryCouncilCollective', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -1850,7 +1735,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -1859,23 +1743,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<
-      Rv,
-      'TreasuryCouncilCollective',
-      'Closed',
-      { proposalHash: H256; yes: number; no: number }
-    >;
+    Closed: GenericPalletEvent<'TreasuryCouncilCollective', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'TreasuryCouncilCollective', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'TreasuryCouncilCollective', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId20 }
@@ -1885,7 +1763,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'TreasuryCouncilCollective',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId20 }
@@ -1894,7 +1771,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OpenTechCommitteeCollective`'s events
@@ -1905,7 +1782,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'Proposed',
       { account: AccountId20; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -1916,7 +1792,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'Voted',
       { account: AccountId20; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -1925,18 +1800,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'OpenTechCommitteeCollective', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'OpenTechCommitteeCollective', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'OpenTechCommitteeCollective', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'OpenTechCommitteeCollective', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -1946,7 +1820,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -1956,7 +1829,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
     Closed: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'Closed',
       { proposalHash: H256; yes: number; no: number }
@@ -1965,13 +1837,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'OpenTechCommitteeCollective', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'OpenTechCommitteeCollective', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId20 }
@@ -1981,7 +1852,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'OpenTechCommitteeCollective',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId20 }
@@ -1990,7 +1860,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -1999,38 +1869,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId20 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId20 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId20 }
@@ -2039,18 +1903,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -2066,28 +1924,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CrowdloanRewards`'s events
@@ -2096,14 +1954,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The initial payment of InitializationPayment % was paid
      **/
-    InitialPaymentMade: GenericPalletEvent<Rv, 'CrowdloanRewards', 'InitialPaymentMade', [AccountId20, bigint]>;
+    InitialPaymentMade: GenericPalletEvent<'CrowdloanRewards', 'InitialPaymentMade', [AccountId20, bigint]>;
 
     /**
      * Someone has proven they made a contribution and associated a native identity with it.
      * Data is the relay account, native account and the total amount of _rewards_ that will be paid
      **/
     NativeIdentityAssociated: GenericPalletEvent<
-      Rv,
       'CrowdloanRewards',
       'NativeIdentityAssociated',
       [FixedBytes<32>, AccountId20, bigint]
@@ -2113,23 +1970,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A contributor has claimed some rewards.
      * Data is the account getting paid and the amount of rewards paid.
      **/
-    RewardsPaid: GenericPalletEvent<Rv, 'CrowdloanRewards', 'RewardsPaid', [AccountId20, bigint]>;
+    RewardsPaid: GenericPalletEvent<'CrowdloanRewards', 'RewardsPaid', [AccountId20, bigint]>;
 
     /**
      * A contributor has updated the reward address.
      **/
-    RewardAddressUpdated: GenericPalletEvent<
-      Rv,
-      'CrowdloanRewards',
-      'RewardAddressUpdated',
-      [AccountId20, AccountId20]
-    >;
+    RewardAddressUpdated: GenericPalletEvent<'CrowdloanRewards', 'RewardAddressUpdated', [AccountId20, AccountId20]>;
 
     /**
      * When initializing the reward vec an already initialized account was found
      **/
     InitializedAlreadyInitializedAccount: GenericPalletEvent<
-      Rv,
       'CrowdloanRewards',
       'InitializedAlreadyInitializedAccount',
       [FixedBytes<32>, AccountId20 | undefined, bigint]
@@ -2139,7 +1990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * When initializing the reward vec an already initialized account was found
      **/
     InitializedAccountWithNotEnoughContribution: GenericPalletEvent<
-      Rv,
       'CrowdloanRewards',
       'InitializedAccountWithNotEnoughContribution',
       [FixedBytes<32>, AccountId20 | undefined, bigint]
@@ -2148,7 +1998,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -2157,12 +2007,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -2172,29 +2022,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -2203,13 +2048,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -2224,7 +2068,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -2239,7 +2082,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -2251,7 +2093,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2262,7 +2103,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -2273,7 +2113,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2285,7 +2124,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -2302,7 +2140,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2314,7 +2151,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2326,7 +2162,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -2342,7 +2177,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2351,13 +2185,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2369,7 +2202,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2380,7 +2212,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -2391,7 +2222,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -2402,7 +2232,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -2418,7 +2247,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2430,7 +2258,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -2446,7 +2273,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2456,7 +2282,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2467,7 +2292,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2477,7 +2301,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -2487,7 +2310,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2496,14 +2318,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -2513,7 +2334,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -2523,7 +2343,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -2532,7 +2351,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -2541,18 +2360,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: bigint; creator: AccountId20; owner: AccountId20 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: bigint; creator: AccountId20; owner: AccountId20 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: bigint; owner: AccountId20; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: bigint; owner: AccountId20; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: bigint; from: AccountId20; to: AccountId20; amount: bigint }
@@ -2561,13 +2379,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: bigint; owner: AccountId20; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: bigint; owner: AccountId20; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: bigint; issuer: AccountId20; admin: AccountId20; freezer: AccountId20 }
@@ -2576,33 +2393,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: bigint; owner: AccountId20 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: bigint; owner: AccountId20 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: bigint; who: AccountId20 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: bigint; who: AccountId20 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: bigint; who: AccountId20 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: bigint; who: AccountId20 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: bigint }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: bigint }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: bigint }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: bigint }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: bigint; accountsDestroyed: number; accountsRemaining: number }
@@ -2612,7 +2428,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: bigint; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2621,23 +2436,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: bigint }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: bigint }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: bigint }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: bigint }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: bigint; owner: AccountId20 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: bigint; owner: AccountId20 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: bigint; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2646,13 +2460,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: bigint }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: bigint }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: bigint; source: AccountId20; delegate: AccountId20; amount: bigint }
@@ -2662,7 +2475,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: bigint; owner: AccountId20; delegate: AccountId20 }
@@ -2673,7 +2485,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: bigint; owner: AccountId20; delegate: AccountId20; destination: AccountId20; amount: bigint }
@@ -2682,13 +2493,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: bigint }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: bigint }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: bigint; newMinBalance: bigint }
@@ -2697,27 +2507,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: bigint; who: AccountId20; depositor: AccountId20 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: bigint; who: AccountId20; depositor: AccountId20 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: bigint; who: AccountId20 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: bigint; who: AccountId20 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: bigint; who: AccountId20; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: bigint; who: AccountId20; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: bigint; who: AccountId20; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: bigint; who: AccountId20; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmTransactor`'s events
@@ -2727,7 +2537,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transacted the inner call through a derivative account in a destination chain.
      **/
     TransactedDerivative: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'TransactedDerivative',
       { accountId: AccountId20; dest: StagingXcmV5Location; call: Bytes; index: number }
@@ -2737,7 +2546,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transacted the call through the sovereign account in a destination chain.
      **/
     TransactedSovereign: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'TransactedSovereign',
       { feePayer?: AccountId20 | undefined; dest: StagingXcmV5Location; call: Bytes }
@@ -2747,7 +2555,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transacted the call through a signed account in a destination chain.
      **/
     TransactedSigned: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'TransactedSigned',
       { feePayer: AccountId20; dest: StagingXcmV5Location; call: Bytes }
@@ -2757,23 +2564,21 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Registered a derivative index for an account id.
      **/
     RegisteredDerivative: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'RegisteredDerivative',
       { accountId: AccountId20; index: number }
     >;
-    DeRegisteredDerivative: GenericPalletEvent<Rv, 'XcmTransactor', 'DeRegisteredDerivative', { index: number }>;
+    DeRegisteredDerivative: GenericPalletEvent<'XcmTransactor', 'DeRegisteredDerivative', { index: number }>;
 
     /**
      * Transact failed
      **/
-    TransactFailed: GenericPalletEvent<Rv, 'XcmTransactor', 'TransactFailed', { error: XcmV5TraitsError }>;
+    TransactFailed: GenericPalletEvent<'XcmTransactor', 'TransactFailed', { error: XcmV5TraitsError }>;
 
     /**
      * Changed the transact info of a location
      **/
     TransactInfoChanged: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'TransactInfoChanged',
       { location: StagingXcmV5Location; remoteInfo: PalletXcmTransactorRemoteTransactInfoWithMaxWeight }
@@ -2782,18 +2587,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Removed the transact info of a location
      **/
-    TransactInfoRemoved: GenericPalletEvent<
-      Rv,
-      'XcmTransactor',
-      'TransactInfoRemoved',
-      { location: StagingXcmV5Location }
-    >;
+    TransactInfoRemoved: GenericPalletEvent<'XcmTransactor', 'TransactInfoRemoved', { location: StagingXcmV5Location }>;
 
     /**
      * Set dest fee per second
      **/
     DestFeePerSecondChanged: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'DestFeePerSecondChanged',
       { location: StagingXcmV5Location; feePerSecond: bigint }
@@ -2803,7 +2602,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Remove dest fee per second
      **/
     DestFeePerSecondRemoved: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'DestFeePerSecondRemoved',
       { location: StagingXcmV5Location }
@@ -2813,7 +2611,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * HRMP manage action succesfully sent
      **/
     HrmpManagementSent: GenericPalletEvent<
-      Rv,
       'XcmTransactor',
       'HrmpManagementSent',
       { action: PalletXcmTransactorHrmpOperation }
@@ -2822,7 +2619,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EthereumXcm`'s events
@@ -2831,12 +2628,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ethereum transaction executed from XCM
      **/
-    ExecutedFromXcm: GenericPalletEvent<Rv, 'EthereumXcm', 'ExecutedFromXcm', { xcmMsgHash: H256; ethTxHash: H256 }>;
+    ExecutedFromXcm: GenericPalletEvent<'EthereumXcm', 'ExecutedFromXcm', { xcmMsgHash: H256; ethTxHash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -2846,7 +2643,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -2874,7 +2670,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -2909,7 +2704,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -2939,7 +2733,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -2958,7 +2751,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EvmForeignAssets`'s events
@@ -2968,7 +2761,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New asset with the asset manager is registered
      **/
     ForeignAssetCreated: GenericPalletEvent<
-      Rv,
       'EvmForeignAssets',
       'ForeignAssetCreated',
       { contractAddress: H160; assetId: bigint; xcmLocation: StagingXcmV5Location; deposit?: bigint | undefined }
@@ -2978,19 +2770,16 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Changed the xcm type mapping for a given asset id
      **/
     ForeignAssetXcmLocationChanged: GenericPalletEvent<
-      Rv,
       'EvmForeignAssets',
       'ForeignAssetXcmLocationChanged',
       { assetId: bigint; previousXcmLocation: StagingXcmV5Location; newXcmLocation: StagingXcmV5Location }
     >;
     ForeignAssetFrozen: GenericPalletEvent<
-      Rv,
       'EvmForeignAssets',
       'ForeignAssetFrozen',
       { assetId: bigint; xcmLocation: StagingXcmV5Location }
     >;
     ForeignAssetUnfrozen: GenericPalletEvent<
-      Rv,
       'EvmForeignAssets',
       'ForeignAssetUnfrozen',
       { assetId: bigint; xcmLocation: StagingXcmV5Location }
@@ -2999,12 +2788,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Tokens have been locked for asset creation
      **/
-    TokensLocked: GenericPalletEvent<Rv, 'EvmForeignAssets', 'TokensLocked', [AccountId20, bigint, U256]>;
+    TokensLocked: GenericPalletEvent<'EvmForeignAssets', 'TokensLocked', [AccountId20, bigint, U256]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmWeightTrader`'s events
@@ -3014,7 +2803,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New supported asset is registered
      **/
     SupportedAssetAdded: GenericPalletEvent<
-      Rv,
       'XcmWeightTrader',
       'SupportedAssetAdded',
       { location: StagingXcmV5Location; relativePrice: bigint }
@@ -3024,7 +2812,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Changed the amount of units we are charging per execution second for a given asset
      **/
     SupportedAssetEdited: GenericPalletEvent<
-      Rv,
       'XcmWeightTrader',
       'SupportedAssetEdited',
       { location: StagingXcmV5Location; relativePrice: bigint }
@@ -3033,28 +2820,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pause support for a given asset
      **/
-    PauseAssetSupport: GenericPalletEvent<
-      Rv,
-      'XcmWeightTrader',
-      'PauseAssetSupport',
-      { location: StagingXcmV5Location }
-    >;
+    PauseAssetSupport: GenericPalletEvent<'XcmWeightTrader', 'PauseAssetSupport', { location: StagingXcmV5Location }>;
 
     /**
      * Resume support for a given asset
      **/
-    ResumeAssetSupport: GenericPalletEvent<
-      Rv,
-      'XcmWeightTrader',
-      'ResumeAssetSupport',
-      { location: StagingXcmV5Location }
-    >;
+    ResumeAssetSupport: GenericPalletEvent<'XcmWeightTrader', 'ResumeAssetSupport', { location: StagingXcmV5Location }>;
 
     /**
      * Supported asset type for fee payment removed
      **/
     SupportedAssetRemoved: GenericPalletEvent<
-      Rv,
       'XcmWeightTrader',
       'SupportedAssetRemoved',
       { location: StagingXcmV5Location }
@@ -3063,7 +2839,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EmergencyParaXcm`'s events
@@ -3072,17 +2848,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The XCM incoming execution was Paused
      **/
-    EnteredPausedXcmMode: GenericPalletEvent<Rv, 'EmergencyParaXcm', 'EnteredPausedXcmMode', undefined>;
+    EnteredPausedXcmMode: GenericPalletEvent<'EmergencyParaXcm', 'EnteredPausedXcmMode', undefined>;
 
     /**
      * The XCM incoming execution returned to normal operation
      **/
-    NormalXcmOperationResumed: GenericPalletEvent<Rv, 'EmergencyParaXcm', 'NormalXcmOperationResumed', undefined>;
+    NormalXcmOperationResumed: GenericPalletEvent<'EmergencyParaXcm', 'NormalXcmOperationResumed', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -3094,7 +2870,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -3113,20 +2888,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -3141,7 +2915,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -3161,7 +2934,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -3183,7 +2955,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -3203,7 +2974,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -3217,14 +2987,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Randomness`'s events
    **/
   randomness: {
     RandomnessRequestedBabeEpoch: GenericPalletEvent<
-      Rv,
       'Randomness',
       'RandomnessRequestedBabeEpoch',
       {
@@ -3239,7 +3008,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     RandomnessRequestedLocal: GenericPalletEvent<
-      Rv,
       'Randomness',
       'RandomnessRequestedLocal',
       {
@@ -3253,14 +3021,14 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
         earliestBlock: number;
       }
     >;
-    RequestFulfilled: GenericPalletEvent<Rv, 'Randomness', 'RequestFulfilled', { id: bigint }>;
-    RequestFeeIncreased: GenericPalletEvent<Rv, 'Randomness', 'RequestFeeIncreased', { id: bigint; newFee: bigint }>;
-    RequestExpirationExecuted: GenericPalletEvent<Rv, 'Randomness', 'RequestExpirationExecuted', { id: bigint }>;
+    RequestFulfilled: GenericPalletEvent<'Randomness', 'RequestFulfilled', { id: bigint }>;
+    RequestFeeIncreased: GenericPalletEvent<'Randomness', 'RequestFeeIncreased', { id: bigint; newFee: bigint }>;
+    RequestExpirationExecuted: GenericPalletEvent<'Randomness', 'RequestExpirationExecuted', { id: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `BridgeKusamaGrandpa`'s events
@@ -3270,7 +3038,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Best finalized chain header has been updated to the header with given number and hash.
      **/
     UpdatedBestFinalizedHeader: GenericPalletEvent<
-      Rv,
       'BridgeKusamaGrandpa',
       'UpdatedBestFinalizedHeader',
       {
@@ -3294,7 +3061,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `BridgeKusamaParachains`'s events
@@ -3304,7 +3071,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The caller has provided head of parachain that the pallet is not configured to track.
      **/
     UntrackedParachainRejected: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'UntrackedParachainRejected',
       {
@@ -3320,7 +3086,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * from the storage proof.
      **/
     MissingParachainHead: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'MissingParachainHead',
       {
@@ -3336,7 +3101,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * storage proof.
      **/
     IncorrectParachainHeadHash: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'IncorrectParachainHeadHash',
       {
@@ -3361,7 +3125,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The caller has provided obsolete parachain head, which is already known to the pallet.
      **/
     RejectedObsoleteParachainHead: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'RejectedObsoleteParachainHead',
       {
@@ -3381,7 +3144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The caller has provided parachain head that exceeds the maximal configured head size.
      **/
     RejectedLargeParachainHead: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'RejectedLargeParachainHead',
       {
@@ -3406,7 +3168,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parachain head has been updated.
      **/
     UpdatedParachainHead: GenericPalletEvent<
-      Rv,
       'BridgeKusamaParachains',
       'UpdatedParachainHead',
       {
@@ -3425,7 +3186,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `BridgeKusamaMessages`'s events
@@ -3435,7 +3196,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message has been accepted and is waiting to be delivered.
      **/
     MessageAccepted: GenericPalletEvent<
-      Rv,
       'BridgeKusamaMessages',
       'MessageAccepted',
       {
@@ -3454,13 +3214,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Messages have been received from the bridged chain.
      **/
-    MessagesReceived: GenericPalletEvent<Rv, 'BridgeKusamaMessages', 'MessagesReceived', BpMessagesReceivedMessages>;
+    MessagesReceived: GenericPalletEvent<'BridgeKusamaMessages', 'MessagesReceived', BpMessagesReceivedMessages>;
 
     /**
      * Messages in the inclusive range have been delivered to the bridged chain.
      **/
     MessagesDelivered: GenericPalletEvent<
-      Rv,
       'BridgeKusamaMessages',
       'MessagesDelivered',
       {
@@ -3479,7 +3238,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `BridgeXcmOverMoonriver`'s events
@@ -3489,7 +3248,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The bridge between two locations has been opened.
      **/
     BridgeOpened: GenericPalletEvent<
-      Rv,
       'BridgeXcmOverMoonriver',
       'BridgeOpened',
       {
@@ -3524,7 +3282,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bridge is going to be closed, but not yet fully pruned from the runtime storage.
      **/
     ClosingBridge: GenericPalletEvent<
-      Rv,
       'BridgeXcmOverMoonriver',
       'ClosingBridge',
       {
@@ -3555,7 +3312,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * again by any participant.
      **/
     BridgePruned: GenericPalletEvent<
-      Rv,
       'BridgeXcmOverMoonriver',
       'BridgePruned',
       {
@@ -3584,6 +3340,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/index.d.ts b/packages/chaintypes/src/moonbeam/index.d.ts
index b2e9c06c..698712de 100644
--- a/packages/chaintypes/src/moonbeam/index.d.ts
+++ b/packages/chaintypes/src/moonbeam/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { AccountId20 } from 'dedot/codecs';
 import type {
   MoonbeamRuntimeRuntimeCall,
@@ -44,26 +44,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameMetadataHashExtensionCheckMetadataHash,
     [],
   ];
-}
-
-export interface VersionedMoonbeamApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: MoonbeamApi
  * @specVersion: 3901
  **/
-export interface MoonbeamApi {
-  legacy: VersionedMoonbeamApi<RpcLegacy>;
-  v2: VersionedMoonbeamApi<RpcV2>;
+export interface MoonbeamApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/moonbeam/json-rpc.d.ts b/packages/chaintypes/src/moonbeam/json-rpc.d.ts
index 541f2755..bb610acf 100644
--- a/packages/chaintypes/src/moonbeam/json-rpc.d.ts
+++ b/packages/chaintypes/src/moonbeam/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -46,6 +46,10 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'childstate_getStorageEntries'
   | 'childstate_getStorageHash'
   | 'childstate_getStorageSize'
+  | 'debug_traceBlockByHash'
+  | 'debug_traceBlockByNumber'
+  | 'debug_traceCall'
+  | 'debug_traceTransaction'
   | 'eth_accounts'
   | 'eth_blockNumber'
   | 'eth_call'
@@ -138,10 +142,14 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'system_syncState'
   | 'system_unstable_networkState'
   | 'system_version'
+  | 'trace_filter'
   | 'transactionWatch_v1_submitAndWatch'
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
+  | 'txpool_content'
+  | 'txpool_inspect'
+  | 'txpool_status'
   | 'web3_clientVersion'
   | 'web3_sha3'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/moonbeam/query.d.ts b/packages/chaintypes/src/moonbeam/query.d.ts
index e29fccef..096d98fe 100644
--- a/packages/chaintypes/src/moonbeam/query.d.ts
+++ b/packages/chaintypes/src/moonbeam/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId20,
   AccountId20Like,
@@ -125,7 +125,7 @@ import type {
   BpXcmBridgeHubBridgeId,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -136,35 +136,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId20Like) => FrameSystemAccountInfo, AccountId20>;
+    account: GenericStorageQuery<(arg: AccountId20Like) => FrameSystemAccountInfo, AccountId20>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -172,7 +172,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -180,28 +180,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -214,14 +214,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -238,21 +238,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -260,21 +260,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -287,12 +287,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -308,7 +308,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -318,7 +318,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -332,7 +331,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -343,7 +342,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -352,14 +351,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -368,7 +367,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -381,7 +380,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -392,7 +391,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -404,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -418,7 +417,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -432,7 +430,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -442,7 +440,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -453,7 +451,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -464,7 +461,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -473,7 +470,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -482,7 +479,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -491,21 +488,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -513,7 +510,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -521,7 +518,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -529,7 +526,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -538,12 +535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -554,7 +551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -564,12 +561,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -579,12 +576,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RootTesting`'s storage queries
@@ -593,7 +590,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -604,14 +601,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -642,7 +639,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId20Like) => PalletBalancesAccountData, AccountId20>;
+    account: GenericStorageQuery<(arg: AccountId20Like) => PalletBalancesAccountData, AccountId20>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -653,7 +650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<PalletBalancesBalanceLock>, AccountId20>;
+    locks: GenericStorageQuery<(arg: AccountId20Like) => Array<PalletBalancesBalanceLock>, AccountId20>;
 
     /**
      * Named reserves on some account balances.
@@ -663,7 +660,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<PalletBalancesReserveData>, AccountId20>;
+    reserves: GenericStorageQuery<(arg: AccountId20Like) => Array<PalletBalancesReserveData>, AccountId20>;
 
     /**
      * Holds on account balances.
@@ -671,7 +668,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId20>;
+    holds: GenericStorageQuery<(arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId20>;
 
     /**
      * Freeze locks on account balances.
@@ -679,12 +676,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId20>;
+    freezes: GenericStorageQuery<(arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -694,18 +691,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainStaking`'s storage queries
@@ -716,14 +713,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    collatorCommission: GenericStorageQuery<Rv, () => Perbill>;
+    collatorCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * The total candidates selected every round
      *
      * @param {Callback<number> =} callback
      **/
-    totalSelected: GenericStorageQuery<Rv, () => number>;
+    totalSelected: GenericStorageQuery<() => number>;
 
     /**
      * Inflation distribution configuration, including accounts that should receive inflation
@@ -733,14 +730,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletParachainStakingInflationDistributionConfig> =} callback
      **/
-    inflationDistributionInfo: GenericStorageQuery<Rv, () => PalletParachainStakingInflationDistributionConfig>;
+    inflationDistributionInfo: GenericStorageQuery<() => PalletParachainStakingInflationDistributionConfig>;
 
     /**
      * Current round index and next round scheduled transition
      *
      * @param {Callback<PalletParachainStakingRoundInfo> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => PalletParachainStakingRoundInfo>;
+    round: GenericStorageQuery<() => PalletParachainStakingRoundInfo>;
 
     /**
      * Get delegator state associated with an account if account is delegating else None
@@ -749,7 +746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegator | undefined> =} callback
      **/
     delegatorState: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegator | undefined,
       AccountId20
     >;
@@ -761,7 +757,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingCandidateMetadata | undefined> =} callback
      **/
     candidateInfo: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingCandidateMetadata | undefined,
       AccountId20
     >;
@@ -773,7 +768,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletParachainStakingDelegationRequestsScheduledRequest>> =} callback
      **/
     delegationScheduledRequests: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<PalletParachainStakingDelegationRequestsScheduledRequest>,
       AccountId20
     >;
@@ -785,7 +779,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletParachainStakingAutoCompoundAutoCompoundConfig>> =} callback
      **/
     autoCompoundingDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<PalletParachainStakingAutoCompoundAutoCompoundConfig>,
       AccountId20
     >;
@@ -797,7 +790,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegations | undefined> =} callback
      **/
     topDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegations | undefined,
       AccountId20
     >;
@@ -809,7 +801,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegations | undefined> =} callback
      **/
     bottomDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegations | undefined,
       AccountId20
     >;
@@ -819,21 +810,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    selectedCandidates: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    selectedCandidates: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * Total capital locked by this staking pallet
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * The pool of collator candidates, each with their total backing stake
      *
      * @param {Callback<PalletParachainStakingSetBoundedOrderedSet> =} callback
      **/
-    candidatePool: GenericStorageQuery<Rv, () => PalletParachainStakingSetBoundedOrderedSet>;
+    candidatePool: GenericStorageQuery<() => PalletParachainStakingSetBoundedOrderedSet>;
 
     /**
      * Snapshot of collator delegation stake at the start of the round
@@ -842,7 +833,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingCollatorSnapshot | undefined> =} callback
      **/
     atStake: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like]) => PalletParachainStakingCollatorSnapshot | undefined,
       [number, AccountId20]
     >;
@@ -854,7 +844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId20Like]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    wasInactive: GenericStorageQuery<Rv, (arg: [number, AccountId20Like]) => [] | undefined, [number, AccountId20]>;
+    wasInactive: GenericStorageQuery<(arg: [number, AccountId20Like]) => [] | undefined, [number, AccountId20]>;
 
     /**
      * Delayed payouts
@@ -862,14 +852,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletParachainStakingDelayedPayout | undefined> =} callback
      **/
-    delayedPayouts: GenericStorageQuery<Rv, (arg: number) => PalletParachainStakingDelayedPayout | undefined, number>;
+    delayedPayouts: GenericStorageQuery<(arg: number) => PalletParachainStakingDelayedPayout | undefined, number>;
 
     /**
      * Inflation configuration
      *
      * @param {Callback<PalletParachainStakingInflationInflationInfo> =} callback
      **/
-    inflationConfig: GenericStorageQuery<Rv, () => PalletParachainStakingInflationInflationInfo>;
+    inflationConfig: GenericStorageQuery<() => PalletParachainStakingInflationInflationInfo>;
 
     /**
      * Total points awarded to collators for block production in the round
@@ -877,7 +867,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    points: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    points: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Points for each collator per round
@@ -885,19 +875,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId20Like]} arg
      * @param {Callback<number> =} callback
      **/
-    awardedPts: GenericStorageQuery<Rv, (arg: [number, AccountId20Like]) => number, [number, AccountId20]>;
+    awardedPts: GenericStorageQuery<(arg: [number, AccountId20Like]) => number, [number, AccountId20]>;
 
     /**
      * Killswitch to enable/disable marking offline feature.
      *
      * @param {Callback<boolean> =} callback
      **/
-    enableMarkingOffline: GenericStorageQuery<Rv, () => boolean>;
+    enableMarkingOffline: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorInherent`'s storage queries
@@ -908,19 +898,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    author: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Check if the inherent was included
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentIncluded: GenericStorageQuery<Rv, () => boolean>;
+    inherentIncluded: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorFilter`'s storage queries
@@ -930,19 +920,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent> =} callback
      **/
-    eligibleRatio: GenericStorageQuery<Rv, () => Percent>;
+    eligibleRatio: GenericStorageQuery<() => Percent>;
 
     /**
      * The number of active authors that will be eligible at each height.
      *
      * @param {Callback<PalletAuthorSlotFilterNumNonZeroU32> =} callback
      **/
-    eligibleCount: GenericStorageQuery<Rv, () => PalletAuthorSlotFilterNumNonZeroU32>;
+    eligibleCount: GenericStorageQuery<() => PalletAuthorSlotFilterNumNonZeroU32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorMapping`'s storage queries
@@ -956,7 +946,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAuthorMappingRegistrationInfo | undefined> =} callback
      **/
     mappingWithDeposit: GenericStorageQuery<
-      Rv,
       (arg: NimbusPrimitivesNimbusCryptoPublic) => PalletAuthorMappingRegistrationInfo | undefined,
       NimbusPrimitivesNimbusCryptoPublic
     >;
@@ -968,7 +957,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<NimbusPrimitivesNimbusCryptoPublic | undefined> =} callback
      **/
     nimbusLookup: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => NimbusPrimitivesNimbusCryptoPublic | undefined,
       AccountId20
     >;
@@ -976,7 +964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MoonbeamOrbiters`'s storage queries
@@ -989,7 +977,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId20 | undefined | undefined> =} callback
      **/
     accountLookupOverride: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => AccountId20 | undefined | undefined,
       AccountId20
     >;
@@ -1001,7 +988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMoonbeamOrbitersCollatorPoolInfo | undefined> =} callback
      **/
     collatorsPool: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletMoonbeamOrbitersCollatorPoolInfo | undefined,
       AccountId20
     >;
@@ -1011,14 +997,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForCollatorsPool: GenericStorageQuery<Rv, () => number>;
+    counterForCollatorsPool: GenericStorageQuery<() => number>;
 
     /**
      * Current round index
      *
      * @param {Callback<number> =} callback
      **/
-    currentRound: GenericStorageQuery<Rv, () => number>;
+    currentRound: GenericStorageQuery<() => number>;
 
     /**
      * If true, it forces the rotation at the next round.
@@ -1027,14 +1013,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    forceRotation: GenericStorageQuery<Rv, () => boolean>;
+    forceRotation: GenericStorageQuery<() => boolean>;
 
     /**
      * Minimum deposit required to be registered as an orbiter
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    minOrbiterDeposit: GenericStorageQuery<Rv, () => bigint | undefined>;
+    minOrbiterDeposit: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Store active orbiter per round and per parent collator
@@ -1043,7 +1029,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
     orbiterPerRound: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like]) => AccountId20 | undefined,
       [number, AccountId20]
     >;
@@ -1054,12 +1039,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    registeredOrbiter: GenericStorageQuery<Rv, (arg: AccountId20Like) => boolean | undefined, AccountId20>;
+    registeredOrbiter: GenericStorageQuery<(arg: AccountId20Like) => boolean | undefined, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AsyncBacking`'s storage queries
@@ -1072,12 +1057,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1090,11 +1075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId20Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId20
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId20Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId20>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1102,16 +1083,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId20Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId20
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId20Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MaintenanceMode`'s storage queries
@@ -1122,12 +1099,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    maintenanceMode: GenericStorageQuery<Rv, () => boolean>;
+    maintenanceMode: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1142,7 +1119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => PalletIdentityRegistration | undefined, AccountId20>;
+    identityOf: GenericStorageQuery<(arg: AccountId20Like) => PalletIdentityRegistration | undefined, AccountId20>;
 
     /**
      * Identifies the primary username of an account.
@@ -1150,7 +1127,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => Bytes | undefined, AccountId20>;
+    usernameOf: GenericStorageQuery<(arg: AccountId20Like) => Bytes | undefined, AccountId20>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1159,7 +1136,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[AccountId20, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => [AccountId20, Data] | undefined, AccountId20>;
+    superOf: GenericStorageQuery<(arg: AccountId20Like) => [AccountId20, Data] | undefined, AccountId20>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1171,7 +1148,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[bigint, Array<AccountId20>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => [bigint, Array<AccountId20>], AccountId20>;
+    subsOf: GenericStorageQuery<(arg: AccountId20Like) => [bigint, Array<AccountId20>], AccountId20>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1181,7 +1158,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1189,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1202,7 +1179,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1216,7 +1193,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId20, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId20, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1230,12 +1206,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1248,7 +1224,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId20Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId20, FixedBytes<32>]
     >;
@@ -1256,7 +1231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MoonbeamLazyMigrations`'s storage queries
@@ -1265,7 +1240,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1278,7 +1253,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<MoonbeamRuntimeRuntimeParamsRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (
         arg: MoonbeamRuntimeRuntimeParamsRuntimeParametersKey,
       ) => MoonbeamRuntimeRuntimeParamsRuntimeParametersValue | undefined,
@@ -1288,7 +1262,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EthereumChainId`'s storage queries
@@ -1299,12 +1273,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    chainId: GenericStorageQuery<Rv, () => bigint>;
+    chainId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -1315,26 +1289,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -1347,7 +1321,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV3, FpRpcTransactionStatus, EthereumReceiptReceiptV4] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV3, FpRpcTransactionStatus, EthereumReceiptReceiptV4] | undefined,
       number
     >;
@@ -1357,40 +1330,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV4> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV4> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV4> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -1401,7 +1374,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -1409,7 +1382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -1417,11 +1390,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -1432,12 +1401,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1449,7 +1418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -1457,19 +1426,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1483,7 +1452,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId20Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId20, number]
     >;
@@ -1496,12 +1464,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<[number, bigint]>, AccountId20>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId20Like) => Array<[number, bigint]>, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1512,7 +1480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1520,7 +1488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1531,7 +1499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1539,7 +1507,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1552,12 +1520,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1568,12 +1536,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TreasuryCouncilCollective`'s storage queries
@@ -1584,7 +1552,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1592,7 +1560,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<MoonbeamRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1603,7 +1571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId20, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId20, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId20, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1611,33 +1579,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    members: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    prime: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OpenTechCommitteeCollective`'s storage queries
@@ -1648,7 +1616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1656,7 +1624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<MoonbeamRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1667,7 +1635,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId20, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId20, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId20, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1675,33 +1643,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    members: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    prime: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1715,7 +1683,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1726,14 +1694,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1743,14 +1711,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1758,19 +1726,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CrowdloanRewards`'s storage queries
@@ -1782,7 +1750,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCrowdloanRewardsRewardInfo | undefined> =} callback
      **/
     accountsPayable: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletCrowdloanRewardsRewardInfo | undefined,
       AccountId20
     >;
@@ -1792,7 +1759,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    claimedRelayChainIds: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [] | undefined, FixedBytes<32>>;
+    claimedRelayChainIds: GenericStorageQuery<(arg: FixedBytes<32>) => [] | undefined, FixedBytes<32>>;
 
     /**
      *
@@ -1800,7 +1767,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCrowdloanRewardsRewardInfo | undefined> =} callback
      **/
     unassociatedContributions: GenericStorageQuery<
-      Rv,
       (arg: FixedBytes<32>) => PalletCrowdloanRewardsRewardInfo | undefined,
       FixedBytes<32>
     >;
@@ -1809,21 +1775,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => boolean>;
+    initialized: GenericStorageQuery<() => boolean>;
 
     /**
      * Vesting block height at the initialization of the pallet
      *
      * @param {Callback<number> =} callback
      **/
-    initRelayBlock: GenericStorageQuery<Rv, () => number>;
+    initRelayBlock: GenericStorageQuery<() => number>;
 
     /**
      * Vesting block height at the initialization of the pallet
      *
      * @param {Callback<number> =} callback
      **/
-    endRelayBlock: GenericStorageQuery<Rv, () => number>;
+    endRelayBlock: GenericStorageQuery<() => number>;
 
     /**
      * Total initialized amount so far. We store this to make pallet funds == contributors reward
@@ -1831,19 +1797,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    initializedRewardAmount: GenericStorageQuery<Rv, () => bigint>;
+    initializedRewardAmount: GenericStorageQuery<() => bigint>;
 
     /**
      * Total number of contributors to aid hinting benchmarking
      *
      * @param {Callback<number> =} callback
      **/
-    totalContributors: GenericStorageQuery<Rv, () => number>;
+    totalContributors: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1861,7 +1827,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1873,7 +1839,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1882,7 +1848,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1894,7 +1859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1904,14 +1868,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1920,7 +1884,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1928,7 +1891,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1939,7 +1902,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1947,7 +1910,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1958,7 +1921,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1966,7 +1929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1975,7 +1938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1987,7 +1949,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2000,7 +1961,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2012,14 +1972,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -2028,7 +1988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId20, XcmVersionedAssetId]
     >;
@@ -2040,7 +1999,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId20
     >;
@@ -2050,7 +2008,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -2063,7 +2021,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -2075,7 +2033,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -2086,7 +2044,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -2094,7 +2051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -2106,7 +2063,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
+    asset: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2115,7 +2072,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId20Like]) => PalletAssetsAssetAccount | undefined,
       [bigint, AccountId20]
     >;
@@ -2129,7 +2085,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId20Like, AccountId20Like]) => PalletAssetsApproval | undefined,
       [bigint, AccountId20, AccountId20]
     >;
@@ -2140,7 +2095,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetMetadata, bigint>;
+    metadata: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetMetadata, bigint>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2155,12 +2110,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => bigint | undefined>;
+    nextAssetId: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmTransactor`'s storage queries
@@ -2174,7 +2129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    indexToAccount: GenericStorageQuery<Rv, (arg: number) => AccountId20 | undefined, number>;
+    indexToAccount: GenericStorageQuery<(arg: number) => AccountId20 | undefined, number>;
 
     /**
      * Stores the transact info of a Location. This defines how much extra weight we need to
@@ -2185,7 +2140,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmTransactorRemoteTransactInfoWithMaxWeight | undefined> =} callback
      **/
     transactInfoWithWeightLimit: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletXcmTransactorRemoteTransactInfoWithMaxWeight | undefined,
       StagingXcmV5Location
     >;
@@ -2198,7 +2152,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     destinationAssetFeePerSecond: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => bigint | undefined,
       StagingXcmV5Location
     >;
@@ -2208,12 +2161,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletXcmTransactorRelayIndicesRelayChainIndices> =} callback
      **/
-    relayIndices: GenericStorageQuery<Rv, () => PalletXcmTransactorRelayIndicesRelayChainIndices>;
+    relayIndices: GenericStorageQuery<() => PalletXcmTransactorRelayIndicesRelayChainIndices>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EthereumXcm`'s storage queries
@@ -2224,19 +2177,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => U256>;
+    nonce: GenericStorageQuery<() => U256>;
 
     /**
      * Whether or not Ethereum-XCM is suspended from executing
      *
      * @param {Callback<boolean> =} callback
      **/
-    ethereumXcmSuspended: GenericStorageQuery<Rv, () => boolean>;
+    ethereumXcmSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -2249,7 +2202,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -2259,7 +2211,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -2268,7 +2220,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -2276,7 +2227,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EvmForeignAssets`'s storage queries
@@ -2290,14 +2241,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    assetsById: GenericStorageQuery<Rv, (arg: bigint) => StagingXcmV5Location | undefined, bigint>;
+    assetsById: GenericStorageQuery<(arg: bigint) => StagingXcmV5Location | undefined, bigint>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAssetsById: GenericStorageQuery<Rv, () => number>;
+    counterForAssetsById: GenericStorageQuery<() => number>;
 
     /**
      * Reverse mapping of AssetsById. Mapping from a foreign asset to an asset id.
@@ -2308,7 +2259,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, PalletMoonbeamForeignAssetsAssetStatus] | undefined> =} callback
      **/
     assetsByLocation: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => [bigint, PalletMoonbeamForeignAssetsAssetStatus] | undefined,
       StagingXcmV5Location
     >;
@@ -2320,7 +2270,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMoonbeamForeignAssetsAssetDepositDetails | undefined> =} callback
      **/
     assetsCreationDetails: GenericStorageQuery<
-      Rv,
       (arg: bigint) => PalletMoonbeamForeignAssetsAssetDepositDetails | undefined,
       bigint
     >;
@@ -2328,7 +2277,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmWeightTrader`'s storage queries
@@ -2343,7 +2292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[boolean, bigint] | undefined> =} callback
      **/
     supportedAssets: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => [boolean, bigint] | undefined,
       StagingXcmV5Location
     >;
@@ -2351,7 +2299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmergencyParaXcm`'s storage queries
@@ -2362,12 +2310,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletEmergencyParaXcmXcmMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletEmergencyParaXcmXcmMode>;
+    mode: GenericStorageQuery<() => PalletEmergencyParaXcmXcmMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -2380,7 +2328,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -2391,12 +2339,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RelayStorageRoots`'s storage queries
@@ -2408,7 +2356,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    relayStorageRoot: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    relayStorageRoot: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * List of all the keys in `RelayStorageRoot`.
@@ -2416,12 +2364,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    relayStorageRootKeys: GenericStorageQuery<Rv, () => Array<number>>;
+    relayStorageRootKeys: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Randomness`'s storage queries
@@ -2433,14 +2381,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletRandomnessRequestState | undefined> =} callback
      **/
-    requests: GenericStorageQuery<Rv, (arg: bigint) => PalletRandomnessRequestState | undefined, bigint>;
+    requests: GenericStorageQuery<(arg: bigint) => PalletRandomnessRequestState | undefined, bigint>;
 
     /**
      * Number of randomness requests made so far, used to generate the next request's uid
      *
      * @param {Callback<bigint> =} callback
      **/
-    requestCount: GenericStorageQuery<Rv, () => bigint>;
+    requestCount: GenericStorageQuery<() => bigint>;
 
     /**
      * Current local per-block VRF randomness
@@ -2448,28 +2396,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    localVrfOutput: GenericStorageQuery<Rv, () => H256 | undefined>;
+    localVrfOutput: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * Relay epoch
      *
      * @param {Callback<bigint> =} callback
      **/
-    relayEpoch: GenericStorageQuery<Rv, () => bigint>;
+    relayEpoch: GenericStorageQuery<() => bigint>;
 
     /**
      * Ensures the mandatory inherent was included in the block
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    inherentIncluded: GenericStorageQuery<Rv, () => [] | undefined>;
+    inherentIncluded: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Records whether this is the first block (genesis or runtime upgrade)
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    notFirstBlock: GenericStorageQuery<Rv, () => [] | undefined>;
+    notFirstBlock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Snapshot of randomness to fulfill all requests that are for the same raw randomness
@@ -2479,7 +2427,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRandomnessRandomnessResult | undefined> =} callback
      **/
     randomnessResults: GenericStorageQuery<
-      Rv,
       (arg: PalletRandomnessRequestType) => PalletRandomnessRandomnessResult | undefined,
       PalletRandomnessRequestType
     >;
@@ -2490,12 +2437,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    previousLocalVrfOutput: GenericStorageQuery<Rv, () => H256>;
+    previousLocalVrfOutput: GenericStorageQuery<() => H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaGrandpa`'s storage queries
@@ -2513,21 +2460,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    freeHeadersRemaining: GenericStorageQuery<Rv, () => number | undefined>;
+    freeHeadersRemaining: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Hash of the header used to bootstrap the pallet.
      *
      * @param {Callback<H256> =} callback
      **/
-    initialHash: GenericStorageQuery<Rv, () => H256>;
+    initialHash: GenericStorageQuery<() => H256>;
 
     /**
      * Hash of the best finalized header.
      *
      * @param {Callback<BpRuntimeHeaderId | undefined> =} callback
      **/
-    bestFinalized: GenericStorageQuery<Rv, () => BpRuntimeHeaderId | undefined>;
+    bestFinalized: GenericStorageQuery<() => BpRuntimeHeaderId | undefined>;
 
     /**
      * A ring buffer of imported hashes. Ordered by the insertion time.
@@ -2535,14 +2482,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    importedHashes: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    importedHashes: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Current ring buffer position.
      *
      * @param {Callback<number> =} callback
      **/
-    importedHashesPointer: GenericStorageQuery<Rv, () => number>;
+    importedHashesPointer: GenericStorageQuery<() => number>;
 
     /**
      * Relevant fields of imported headers.
@@ -2550,14 +2497,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<BpHeaderChainStoredHeaderData | undefined> =} callback
      **/
-    importedHeaders: GenericStorageQuery<Rv, (arg: H256) => BpHeaderChainStoredHeaderData | undefined, H256>;
+    importedHeaders: GenericStorageQuery<(arg: H256) => BpHeaderChainStoredHeaderData | undefined, H256>;
 
     /**
      * The current GRANDPA Authority set.
      *
      * @param {Callback<PalletBridgeGrandpaStorageTypesStoredAuthoritySet> =} callback
      **/
-    currentAuthoritySet: GenericStorageQuery<Rv, () => PalletBridgeGrandpaStorageTypesStoredAuthoritySet>;
+    currentAuthoritySet: GenericStorageQuery<() => PalletBridgeGrandpaStorageTypesStoredAuthoritySet>;
 
     /**
      * Optional pallet owner.
@@ -2569,7 +2516,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2578,12 +2525,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpRuntimeBasicOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpRuntimeBasicOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpRuntimeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaParachains`'s storage queries
@@ -2599,7 +2546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2608,7 +2555,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpRuntimeBasicOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpRuntimeBasicOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpRuntimeBasicOperatingMode>;
 
     /**
      * Parachains info.
@@ -2621,7 +2568,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpParachainsParaInfo | undefined> =} callback
      **/
     parasInfo: GenericStorageQuery<
-      Rv,
       (arg: BpPolkadotCoreParachainsParaId) => BpParachainsParaInfo | undefined,
       BpPolkadotCoreParachainsParaId
     >;
@@ -2633,7 +2579,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpParachainsParaStoredHeaderData | undefined> =} callback
      **/
     importedParaHeads: GenericStorageQuery<
-      Rv,
       (arg: [BpPolkadotCoreParachainsParaId, H256]) => BpParachainsParaStoredHeaderData | undefined,
       [BpPolkadotCoreParachainsParaId, H256]
     >;
@@ -2645,7 +2590,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     importedParaHashes: GenericStorageQuery<
-      Rv,
       (arg: [BpPolkadotCoreParachainsParaId, number]) => H256 | undefined,
       [BpPolkadotCoreParachainsParaId, number]
     >;
@@ -2653,7 +2597,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaMessages`'s storage queries
@@ -2669,7 +2613,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2678,7 +2622,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpMessagesMessagesOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpMessagesMessagesOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpMessagesMessagesOperatingMode>;
 
     /**
      * Map of lane id => inbound lane data.
@@ -2687,7 +2631,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpMessagesInboundLaneData | undefined> =} callback
      **/
     inboundLanes: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpMessagesInboundLaneData | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2699,7 +2642,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpMessagesOutboundLaneData | undefined> =} callback
      **/
     outboundLanes: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpMessagesOutboundLaneData | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2710,12 +2652,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BpMessagesMessageKey} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    outboundMessages: GenericStorageQuery<Rv, (arg: BpMessagesMessageKey) => Bytes | undefined, BpMessagesMessageKey>;
+    outboundMessages: GenericStorageQuery<(arg: BpMessagesMessageKey) => Bytes | undefined, BpMessagesMessageKey>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeXcmOverMoonriver`'s storage queries
@@ -2728,7 +2670,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpXcmBridgeHubBridge | undefined> =} callback
      **/
     bridges: GenericStorageQuery<
-      Rv,
       (arg: BpXcmBridgeHubBridgeId) => BpXcmBridgeHubBridge | undefined,
       BpXcmBridgeHubBridgeId
     >;
@@ -2740,7 +2681,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpXcmBridgeHubBridgeId | undefined> =} callback
      **/
     laneToBridge: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpXcmBridgeHubBridgeId | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2748,6 +2688,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/runtime.d.ts b/packages/chaintypes/src/moonbeam/runtime.d.ts
index b7726d67..e9bbc9c7 100644
--- a/packages/chaintypes/src/moonbeam/runtime.d.ts
+++ b/packages/chaintypes/src/moonbeam/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   Result,
   H256,
@@ -60,7 +60,7 @@ import type {
   XcmRuntimeApisConversionsError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
    **/
@@ -82,7 +82,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: FpSelfContainedUncheckedExtrinsic,
@@ -95,7 +94,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: UnincludedSegmentApi - 0xd0399cd053adda2b
@@ -117,12 +116,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: KusamaFinalityApi - 0xdd5c5617e520964d
@@ -133,7 +132,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: KusamaFinalityApi_best_finalized
      **/
-    bestFinalized: GenericRuntimeApiMethod<Rv, () => Promise<BpRuntimeHeaderId | undefined>>;
+    bestFinalized: GenericRuntimeApiMethod<() => Promise<BpRuntimeHeaderId | undefined>>;
 
     /**
      * Returns free headers interval, if it is configured in the runtime.
@@ -144,19 +143,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: KusamaFinalityApi_free_headers_interval
      **/
-    freeHeadersInterval: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    freeHeadersInterval: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Returns the justifications accepted in the current block.
      *
      * @callname: KusamaFinalityApi_synced_headers_grandpa_info
      **/
-    syncedHeadersGrandpaInfo: GenericRuntimeApiMethod<Rv, () => Promise<Array<BpHeaderChainHeaderFinalityInfo>>>;
+    syncedHeadersGrandpaInfo: GenericRuntimeApiMethod<() => Promise<Array<BpHeaderChainHeaderFinalityInfo>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MoonriverKusamaFinalityApi - 0x597206dd17637029
@@ -167,7 +166,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MoonriverKusamaFinalityApi_best_finalized
      **/
-    bestFinalized: GenericRuntimeApiMethod<Rv, () => Promise<BpRuntimeHeaderId | undefined>>;
+    bestFinalized: GenericRuntimeApiMethod<() => Promise<BpRuntimeHeaderId | undefined>>;
 
     /**
      * Returns free headers interval, if it is configured in the runtime.
@@ -178,12 +177,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MoonriverKusamaFinalityApi_free_headers_interval
      **/
-    freeHeadersInterval: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    freeHeadersInterval: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ToMoonriverKusamaOutboundLaneApi - 0xad8e997e04156ad4
@@ -202,14 +201,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint} end
      **/
     messageDetails: GenericRuntimeApiMethod<
-      Rv,
       (lane: BpMessagesLaneHashedLaneId, begin: bigint, end: bigint) => Promise<Array<BpMessagesOutboundMessageDetails>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: FromMoonriverKusamaInboundLaneApi - 0xaceed5723e524773
@@ -223,7 +221,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[BytesLike, BpMessagesOutboundMessageDetails]>} messages
      **/
     messageDetails: GenericRuntimeApiMethod<
-      Rv,
       (
         lane: BpMessagesLaneHashedLaneId,
         messages: Array<[BytesLike, BpMessagesOutboundMessageDetails]>,
@@ -233,7 +230,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -244,7 +241,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -252,7 +249,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -260,12 +257,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -276,7 +273,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -287,7 +284,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -296,12 +293,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -317,7 +314,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FpSelfContainedUncheckedExtrinsic} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: FpSelfContainedUncheckedExtrinsic,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -328,7 +324,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -337,7 +333,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<FpSelfContainedUncheckedExtrinsic>>
     >;
 
@@ -349,14 +344,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -368,12 +362,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -391,7 +385,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -402,14 +396,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -430,7 +423,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -451,7 +444,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -461,12 +454,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -478,12 +471,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId20Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId20Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId20Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DebugRuntimeApi - 0xbd78255d4feeea1f
@@ -497,7 +490,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Header} header
      **/
     traceTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsics: Array<FpSelfContainedUncheckedExtrinsic>,
         transaction: EthereumTransactionTransactionV3,
@@ -513,7 +505,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Header} header
      **/
     traceBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsics: Array<FpSelfContainedUncheckedExtrinsic>,
         knownTransactions: Array<H256>,
@@ -537,7 +528,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem> | undefined} authorization_list
      **/
     traceCall: GenericRuntimeApiMethod<
-      Rv,
       (
         header: Header,
         from: H160,
@@ -556,7 +546,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TxPoolRuntimeApi - 0xa33d43f58731ad84
@@ -569,7 +559,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xt_future
      **/
     extrinsicFilter: GenericRuntimeApiMethod<
-      Rv,
       (
         xtReady: Array<FpSelfContainedUncheckedExtrinsic>,
         xtFuture: Array<FpSelfContainedUncheckedExtrinsic>,
@@ -579,7 +568,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EthereumRuntimeRPCApi - 0x582211f65bb14b89
@@ -590,7 +579,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_chain_id
      **/
-    chainId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    chainId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Returns pallet_evm::Accounts by address.
@@ -598,14 +587,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_basic
      * @param {H160} address
      **/
-    accountBasic: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<EvmBackendBasic>>;
+    accountBasic: GenericRuntimeApiMethod<(address: H160) => Promise<EvmBackendBasic>>;
 
     /**
      * Returns FixedGasPrice::min_gas_price
      *
      * @callname: EthereumRuntimeRPCApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * For a given account address, returns pallet_evm::AccountCodes.
@@ -613,14 +602,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_code_at
      * @param {H160} address
      **/
-    accountCodeAt: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    accountCodeAt: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Returns the converted FindAuthor::find_author authority id.
      *
      * @callname: EthereumRuntimeRPCApi_author
      **/
-    author: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    author: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * For a given account address and index, returns pallet_evm::AccountStorages.
@@ -629,7 +618,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} address
      * @param {U256} index
      **/
-    storageAt: GenericRuntimeApiMethod<Rv, (address: H160, index: U256) => Promise<H256>>;
+    storageAt: GenericRuntimeApiMethod<(address: H160, index: U256) => Promise<H256>>;
 
     /**
      *
@@ -647,7 +636,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem> | undefined} authorization_list
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -678,7 +666,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem> | undefined} authorization_list
      **/
     create: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         data: BytesLike,
@@ -698,28 +685,27 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_current_block
      **/
-    currentBlock: GenericRuntimeApiMethod<Rv, () => Promise<EthereumBlock | undefined>>;
+    currentBlock: GenericRuntimeApiMethod<() => Promise<EthereumBlock | undefined>>;
 
     /**
      * Return the current receipt.
      *
      * @callname: EthereumRuntimeRPCApi_current_receipts
      **/
-    currentReceipts: GenericRuntimeApiMethod<Rv, () => Promise<Array<EthereumReceiptReceiptV4> | undefined>>;
+    currentReceipts: GenericRuntimeApiMethod<() => Promise<Array<EthereumReceiptReceiptV4> | undefined>>;
 
     /**
      * Return the current transaction status.
      *
      * @callname: EthereumRuntimeRPCApi_current_transaction_statuses
      **/
-    currentTransactionStatuses: GenericRuntimeApiMethod<Rv, () => Promise<Array<FpRpcTransactionStatus> | undefined>>;
+    currentTransactionStatuses: GenericRuntimeApiMethod<() => Promise<Array<FpRpcTransactionStatus> | undefined>>;
 
     /**
      *
      * @callname: EthereumRuntimeRPCApi_current_all
      **/
     currentAll: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<
         [
           EthereumBlock | undefined,
@@ -736,7 +722,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     extrinsicFilter: GenericRuntimeApiMethod<
-      Rv,
       (xts: Array<FpSelfContainedUncheckedExtrinsic>) => Promise<Array<EthereumTransactionTransactionV3>>
     >;
 
@@ -745,7 +730,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_elasticity
      **/
-    elasticity: GenericRuntimeApiMethod<Rv, () => Promise<Permill | undefined>>;
+    elasticity: GenericRuntimeApiMethod<() => Promise<Permill | undefined>>;
 
     /**
      * Used to determine if gas limit multiplier for non-transactional calls (eth_call/estimateGas)
@@ -753,7 +738,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_gas_limit_multiplier_support
      **/
-    gasLimitMultiplierSupport: GenericRuntimeApiMethod<Rv, () => Promise<[]>>;
+    gasLimitMultiplierSupport: GenericRuntimeApiMethod<() => Promise<[]>>;
 
     /**
      * Return the pending block.
@@ -762,7 +747,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     pendingBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         xts: Array<FpSelfContainedUncheckedExtrinsic>,
       ) => Promise<[EthereumBlock | undefined, Array<FpRpcTransactionStatus> | undefined]>
@@ -778,12 +762,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_initialize_pending_block
      * @param {Header} header
      **/
-    initializePendingBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    initializePendingBlock: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ConvertTransactionRuntimeApi - 0xe65b00e46cedd0aa
@@ -795,14 +779,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {EthereumTransactionTransactionV3} transaction
      **/
     convertTransaction: GenericRuntimeApiMethod<
-      Rv,
       (transaction: EthereumTransactionTransactionV3) => Promise<FpSelfContainedUncheckedExtrinsic>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -815,7 +798,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -826,7 +808,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -835,19 +816,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NimbusApi - 0x2aa62120049dd2d2
@@ -861,14 +842,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Header} parent_header
      **/
     canAuthor: GenericRuntimeApiMethod<
-      Rv,
       (author: NimbusPrimitivesNimbusCryptoPublic, relayParent: number, parentHeader: Header) => Promise<boolean>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -883,12 +863,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: VrfApi - 0xba8173bf23b2e6f8
@@ -898,7 +878,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: VrfApi_get_last_vrf_output
      **/
-    getLastVrfOutput: GenericRuntimeApiMethod<Rv, () => Promise<H256 | undefined>>;
+    getLastVrfOutput: GenericRuntimeApiMethod<() => Promise<H256 | undefined>>;
 
     /**
      *
@@ -906,14 +886,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {NimbusPrimitivesNimbusCryptoPublic} nimbus_id
      **/
     vrfKeyLookup: GenericRuntimeApiMethod<
-      Rv,
       (nimbusId: NimbusPrimitivesNimbusCryptoPublic) => Promise<SessionKeysPrimitivesVrfVrfCryptoPublic | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -930,7 +909,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -945,7 +923,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -962,7 +939,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -981,7 +957,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -991,7 +966,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -1006,7 +981,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: MoonbeamRuntimeOriginCaller,
         call: MoonbeamRuntimeRuntimeCallLike,
@@ -1022,7 +996,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -1032,7 +1005,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -1045,13 +1018,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId20, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/tx.d.ts b/packages/chaintypes/src/moonbeam/tx.d.ts
index aa34898f..6faa78a7 100644
--- a/packages/chaintypes/src/moonbeam/tx.d.ts
+++ b/packages/chaintypes/src/moonbeam/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   AccountId20Like,
@@ -77,16 +75,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = MoonbeamRuntimeRuntimeCallLike,
-> = Extrinsic<AccountId20Like, T, AccountEthereumSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<AccountId20Like, T, AccountEthereumSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<MoonbeamRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -99,16 +99,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -118,16 +117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -137,16 +135,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -159,16 +156,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -178,16 +174,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -197,16 +192,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -220,19 +214,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -242,16 +235,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -264,16 +256,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -290,16 +281,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -317,23 +307,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -353,16 +342,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPrimitivesParachainInherentParachainInherentData} data
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (data: CumulusPrimitivesParachainInherentParachainInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SetValidationData';
             params: { data: CumulusPrimitivesParachainInherentParachainInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -371,23 +359,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -417,23 +404,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RootTesting`'s transaction calls
@@ -445,16 +431,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} ratio
      **/
     fillBlock: GenericTxCall<
-      Rv,
       (ratio: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'FillBlock';
             params: { ratio: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -462,22 +447,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     triggerDefensive: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'TriggerDefensive';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -496,19 +480,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: AccountId20Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: AccountId20Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -521,20 +504,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId20Like,
         dest: AccountId20Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId20Like; dest: AccountId20Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -550,19 +532,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId20Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId20Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -587,19 +568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId20Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId20Like; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -612,19 +592,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -641,16 +620,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId20Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId20Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId20Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -663,19 +641,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId20Like,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: AccountId20Like; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -690,19 +667,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -719,26 +695,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainStaking`'s transaction calls
@@ -751,16 +726,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {{min: bigint, ideal: bigint, max: bigint}} expectations
      **/
     setStakingExpectations: GenericTxCall<
-      Rv,
       (expectations: { min: bigint; ideal: bigint; max: bigint }) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetStakingExpectations';
             params: { expectations: { min: bigint; ideal: bigint; max: bigint } };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -770,16 +744,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {{min: Perbill, ideal: Perbill, max: Perbill}} schedule
      **/
     setInflation: GenericTxCall<
-      Rv,
       (schedule: { min: Perbill; ideal: Perbill; max: Perbill }) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetInflation';
             params: { schedule: { min: Perbill; ideal: Perbill; max: Perbill } };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -790,16 +763,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setTotalSelected: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetTotalSelected';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -809,16 +781,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setCollatorCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetCollatorCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -831,16 +802,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setBlocksPerRound: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetBlocksPerRound';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -851,19 +821,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateCount
      **/
     joinCandidates: GenericTxCall<
-      Rv,
       (
         bond: bigint,
         candidateCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'JoinCandidates';
             params: { bond: bigint; candidateCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -874,16 +843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateCount
      **/
     scheduleLeaveCandidates: GenericTxCall<
-      Rv,
       (candidateCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ScheduleLeaveCandidates';
             params: { candidateCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -894,19 +862,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateDelegationCount
      **/
     executeLeaveCandidates: GenericTxCall<
-      Rv,
       (
         candidate: AccountId20Like,
         candidateDelegationCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ExecuteLeaveCandidates';
             params: { candidate: AccountId20Like; candidateDelegationCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -918,16 +885,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateCount
      **/
     cancelLeaveCandidates: GenericTxCall<
-      Rv,
       (candidateCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'CancelLeaveCandidates';
             params: { candidateCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -936,15 +902,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     goOffline: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'GoOffline';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -953,15 +918,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     goOnline: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'GoOnline';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -971,16 +935,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} more
      **/
     candidateBondMore: GenericTxCall<
-      Rv,
       (more: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'CandidateBondMore';
             params: { more: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -990,16 +953,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} less
      **/
     scheduleCandidateBondLess: GenericTxCall<
-      Rv,
       (less: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ScheduleCandidateBondLess';
             params: { less: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1009,16 +971,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} candidate
      **/
     executeCandidateBondLess: GenericTxCall<
-      Rv,
       (candidate: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ExecuteCandidateBondLess';
             params: { candidate: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1027,15 +988,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelCandidateBondLess: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'CancelCandidateBondLess';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1052,7 +1012,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delegationCount
      **/
     delegateWithAutoCompound: GenericTxCall<
-      Rv,
       (
         candidate: AccountId20Like,
         amount: bigint,
@@ -1061,7 +1020,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         candidateAutoCompoundingDelegationCount: number,
         delegationCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
@@ -1075,7 +1033,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               delegationCount: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1088,16 +1047,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} collator
      **/
     scheduleRevokeDelegation: GenericTxCall<
-      Rv,
       (collator: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ScheduleRevokeDelegation';
             params: { collator: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1108,19 +1066,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} more
      **/
     delegatorBondMore: GenericTxCall<
-      Rv,
       (
         candidate: AccountId20Like,
         more: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'DelegatorBondMore';
             params: { candidate: AccountId20Like; more: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1133,19 +1090,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} less
      **/
     scheduleDelegatorBondLess: GenericTxCall<
-      Rv,
       (
         candidate: AccountId20Like,
         less: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ScheduleDelegatorBondLess';
             params: { candidate: AccountId20Like; less: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1156,19 +1112,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} candidate
      **/
     executeDelegationRequest: GenericTxCall<
-      Rv,
       (
         delegator: AccountId20Like,
         candidate: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ExecuteDelegationRequest';
             params: { delegator: AccountId20Like; candidate: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1178,16 +1133,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} candidate
      **/
     cancelDelegationRequest: GenericTxCall<
-      Rv,
       (candidate: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'CancelDelegationRequest';
             params: { candidate: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1200,14 +1154,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delegationCountHint
      **/
     setAutoCompound: GenericTxCall<
-      Rv,
       (
         candidate: AccountId20Like,
         value: Percent,
         candidateAutoCompoundingDelegationCountHint: number,
         delegationCountHint: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
@@ -1219,7 +1171,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               delegationCountHint: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1229,16 +1182,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} collator
      **/
     notifyInactiveCollator: GenericTxCall<
-      Rv,
       (collator: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'NotifyInactiveCollator';
             params: { collator: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1248,16 +1200,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     enableMarkingOffline: GenericTxCall<
-      Rv,
       (value: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'EnableMarkingOffline';
             params: { value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1270,20 +1221,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateCount
      **/
     forceJoinCandidates: GenericTxCall<
-      Rv,
       (
         account: AccountId20Like,
         bond: bigint,
         candidateCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'ForceJoinCandidates';
             params: { account: AccountId20Like; bond: bigint; candidateCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1293,23 +1243,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletParachainStakingInflationDistributionConfig} new_
      **/
     setInflationDistributionConfig: GenericTxCall<
-      Rv,
       (new_: PalletParachainStakingInflationDistributionConfig) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainStaking';
           palletCall: {
             name: 'SetInflationDistributionConfig';
             params: { new: PalletParachainStakingInflationDistributionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AuthorInherent`'s transaction calls
@@ -1321,20 +1270,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     kickOffAuthorshipValidation: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorInherent';
           palletCall: 'KickOffAuthorshipValidation';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AuthorFilter`'s transaction calls
@@ -1346,23 +1294,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAuthorSlotFilterNumNonZeroU32} new_
      **/
     setEligible: GenericTxCall<
-      Rv,
       (new_: PalletAuthorSlotFilterNumNonZeroU32) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorFilter';
           palletCall: {
             name: 'SetEligible';
             params: { new: PalletAuthorSlotFilterNumNonZeroU32 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AuthorMapping`'s transaction calls
@@ -1377,16 +1324,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {NimbusPrimitivesNimbusCryptoPublic} nimbusId
      **/
     addAssociation: GenericTxCall<
-      Rv,
       (nimbusId: NimbusPrimitivesNimbusCryptoPublic) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorMapping';
           palletCall: {
             name: 'AddAssociation';
             params: { nimbusId: NimbusPrimitivesNimbusCryptoPublic };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1401,12 +1347,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {NimbusPrimitivesNimbusCryptoPublic} newNimbusId
      **/
     updateAssociation: GenericTxCall<
-      Rv,
       (
         oldNimbusId: NimbusPrimitivesNimbusCryptoPublic,
         newNimbusId: NimbusPrimitivesNimbusCryptoPublic,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorMapping';
           palletCall: {
@@ -1416,7 +1360,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newNimbusId: NimbusPrimitivesNimbusCryptoPublic;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1429,16 +1374,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {NimbusPrimitivesNimbusCryptoPublic} nimbusId
      **/
     clearAssociation: GenericTxCall<
-      Rv,
       (nimbusId: NimbusPrimitivesNimbusCryptoPublic) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorMapping';
           palletCall: {
             name: 'ClearAssociation';
             params: { nimbusId: NimbusPrimitivesNimbusCryptoPublic };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1450,15 +1394,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorMapping';
           palletCall: {
             name: 'RemoveKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1472,23 +1415,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} keys
      **/
     setKeys: GenericTxCall<
-      Rv,
       (keys: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AuthorMapping';
           palletCall: {
             name: 'SetKeys';
             params: { keys: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MoonbeamOrbiters`'s transaction calls
@@ -1500,16 +1442,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} orbiter
      **/
     collatorAddOrbiter: GenericTxCall<
-      Rv,
       (orbiter: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'CollatorAddOrbiter';
             params: { orbiter: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1519,16 +1460,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} orbiter
      **/
     collatorRemoveOrbiter: GenericTxCall<
-      Rv,
       (orbiter: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'CollatorRemoveOrbiter';
             params: { orbiter: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1538,16 +1478,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} collator
      **/
     orbiterLeaveCollatorPool: GenericTxCall<
-      Rv,
       (collator: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'OrbiterLeaveCollatorPool';
             params: { collator: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1556,15 +1495,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     orbiterRegister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'OrbiterRegister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1574,16 +1512,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collatorsPoolCount
      **/
     orbiterUnregister: GenericTxCall<
-      Rv,
       (collatorsPoolCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'OrbiterUnregister';
             params: { collatorsPoolCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1593,16 +1530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} collator
      **/
     addCollator: GenericTxCall<
-      Rv,
       (collator: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'AddCollator';
             params: { collator: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1612,23 +1548,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} collator
      **/
     removeCollator: GenericTxCall<
-      Rv,
       (collator: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamOrbiters';
           palletCall: {
             name: 'RemoveCollator';
             params: { collator: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1657,16 +1592,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MoonbeamRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<MoonbeamRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<MoonbeamRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1689,19 +1623,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1723,16 +1656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MoonbeamRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<MoonbeamRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<MoonbeamRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1748,19 +1680,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: MoonbeamRuntimeOriginCaller,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: MoonbeamRuntimeOriginCaller; call: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1782,16 +1713,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MoonbeamRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<MoonbeamRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<MoonbeamRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1807,19 +1737,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: MoonbeamRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: MoonbeamRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1852,19 +1781,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: MoonbeamRuntimeRuntimeCallLike,
         fallback: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: MoonbeamRuntimeRuntimeCallLike; fallback: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1879,26 +1807,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: MoonbeamRuntimeOriginCaller,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: MoonbeamRuntimeOriginCaller; call: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -1920,13 +1847,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: AccountId20Like,
         forceProxyType: MoonbeamRuntimeProxyType | undefined,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -1937,7 +1862,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1957,20 +1883,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId20Like,
         proxyType: MoonbeamRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: AccountId20Like; proxyType: MoonbeamRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1988,20 +1913,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId20Like,
         proxyType: MoonbeamRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: AccountId20Like; proxyType: MoonbeamRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2015,15 +1939,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2052,20 +1975,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: MoonbeamRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: MoonbeamRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2094,7 +2016,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: AccountId20Like,
         proxyType: MoonbeamRuntimeProxyType,
@@ -2102,7 +2023,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2115,7 +2035,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2140,19 +2061,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: AccountId20Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: AccountId20Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2172,19 +2092,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: AccountId20Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: AccountId20Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2204,19 +2123,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: AccountId20Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: AccountId20Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2239,14 +2157,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: AccountId20Like,
         real: AccountId20Like,
         forceProxyType: MoonbeamRuntimeProxyType | undefined,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2258,7 +2174,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2274,22 +2191,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MaintenanceMode`'s transaction calls
@@ -2304,13 +2220,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     enterMaintenanceMode: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MaintenanceMode';
           palletCall: 'EnterMaintenanceMode';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2323,20 +2238,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeNormalOperation: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MaintenanceMode';
           palletCall: 'ResumeNormalOperation';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2354,16 +2268,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2382,16 +2295,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2409,16 +2321,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId20Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId20Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId20Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2434,15 +2345,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2468,19 +2378,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2499,16 +2408,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2525,19 +2433,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2554,19 +2461,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2583,19 +2489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2622,21 +2527,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: AccountId20Like,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: AccountId20Like; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2657,16 +2561,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2683,19 +2586,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId20Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: AccountId20Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2709,19 +2611,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId20Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: AccountId20Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2737,16 +2638,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2764,15 +2664,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2788,20 +2687,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: AccountId20Like,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: AccountId20Like; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2812,19 +2710,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2849,14 +2746,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: AccountId20Like,
         username: BytesLike,
         signature: AccountEthereumSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -2868,7 +2763,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2879,16 +2775,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2900,16 +2795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2919,16 +2813,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2940,16 +2833,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2960,16 +2852,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2980,23 +2871,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3020,19 +2910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId20Like>,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId20Like>; call: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3084,7 +2973,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId20Like>,
@@ -3092,7 +2980,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: MoonbeamRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3105,7 +2992,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3148,7 +3036,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId20Like>,
@@ -3156,7 +3043,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3169,7 +3055,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3202,14 +3089,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId20Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3221,7 +3106,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3245,27 +3131,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId20Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId20Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MoonbeamLazyMigrations`'s transaction calls
@@ -3276,23 +3161,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     createContractMetadata: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MoonbeamLazyMigrations';
           palletCall: {
             name: 'CreateContractMetadata';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -3307,23 +3191,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeParamsRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: MoonbeamRuntimeRuntimeParamsRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: MoonbeamRuntimeRuntimeParamsRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVM`'s transaction calls
@@ -3336,19 +3219,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         address: H160,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
             name: 'Withdraw';
             params: { address: H160; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3367,7 +3249,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem>} authorizationList
      **/
     call: GenericTxCall<
-      Rv,
       (
         source: H160,
         target: H160,
@@ -3380,7 +3261,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         accessList: Array<[H160, Array<H256>]>,
         authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -3398,7 +3278,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3417,7 +3298,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem>} authorizationList
      **/
     create: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -3429,7 +3309,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         accessList: Array<[H160, Array<H256>]>,
         authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -3446,7 +3325,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3465,7 +3345,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<EthereumTransactionEip7702AuthorizationListItem>} authorizationList
      **/
     create2: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -3478,7 +3357,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         accessList: Array<[H160, Array<H256>]>,
         authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -3496,14 +3374,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               authorizationList: Array<EthereumTransactionEip7702AuthorizationListItem>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Ethereum`'s transaction calls
@@ -3515,23 +3394,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {EthereumTransactionTransactionV3} transaction
      **/
     transact: GenericTxCall<
-      Rv,
       (transaction: EthereumTransactionTransactionV3) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ethereum';
           palletCall: {
             name: 'Transact';
             params: { transaction: EthereumTransactionTransactionV3 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -3546,14 +3424,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3565,7 +3441,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3576,19 +3453,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3602,7 +3478,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -3610,7 +3485,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3623,7 +3497,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3633,16 +3508,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3655,14 +3529,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3674,7 +3546,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3688,7 +3561,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -3696,7 +3568,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: MoonbeamRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3709,7 +3580,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: MoonbeamRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3732,20 +3604,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3768,20 +3639,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3791,16 +3661,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3810,23 +3679,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -3841,16 +3709,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3865,16 +3732,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3887,16 +3753,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3908,16 +3773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3929,23 +3793,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -3966,19 +3829,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4013,14 +3875,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: AccountId20Like,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -4032,7 +3892,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4055,16 +3916,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4083,19 +3943,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4134,19 +3993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4173,27 +4031,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId20Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId20Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -4215,13 +4072,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: MoonbeamRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -4232,7 +4087,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4249,16 +4105,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4274,16 +4129,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4298,16 +4152,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4322,16 +4175,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4344,16 +4196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4371,16 +4222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4396,16 +4246,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4422,26 +4271,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -4452,16 +4300,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4470,16 +4317,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4490,20 +4336,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4512,23 +4357,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MoonbeamRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: MoonbeamRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: MoonbeamRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TreasuryCouncilCollective`'s transaction calls
@@ -4565,20 +4409,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId20Like>,
         prime: AccountId20Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId20Like>; prime: AccountId20Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4597,19 +4440,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: MoonbeamRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'Execute';
             params: { proposal: MoonbeamRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4634,20 +4476,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: MoonbeamRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: MoonbeamRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4667,20 +4508,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4699,16 +4539,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4744,14 +4583,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
@@ -4763,7 +4600,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4779,16 +4617,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4806,23 +4643,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TreasuryCouncilCollective';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OpenTechCommitteeCollective`'s transaction calls
@@ -4859,20 +4695,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId20Like>,
         prime: AccountId20Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId20Like>; prime: AccountId20Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4891,19 +4726,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: MoonbeamRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'Execute';
             params: { proposal: MoonbeamRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4928,20 +4762,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: MoonbeamRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: MoonbeamRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4961,20 +4794,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4993,16 +4825,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5038,14 +4869,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
@@ -5057,7 +4886,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5073,16 +4903,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5100,23 +4929,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OpenTechCommitteeCollective';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -5145,19 +4973,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5187,16 +5014,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5234,14 +5060,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         amount: bigint,
         beneficiary: AccountId20Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -5253,7 +5077,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5281,16 +5106,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5318,16 +5142,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5352,23 +5175,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CrowdloanRewards`'s transaction calls
@@ -5386,20 +5208,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature} proof
      **/
     associateNativeIdentity: GenericTxCall<
-      Rv,
       (
         rewardAccount: AccountId20Like,
         relayAccount: FixedBytes<32>,
         proof: SpRuntimeMultiSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
             name: 'AssociateNativeIdentity';
             params: { rewardAccount: AccountId20Like; relayAccount: FixedBytes<32>; proof: SpRuntimeMultiSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5415,13 +5236,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[FixedBytes<32>, SpRuntimeMultiSignature]>} proofs
      **/
     changeAssociationWithRelayKeys: GenericTxCall<
-      Rv,
       (
         rewardAccount: AccountId20Like,
         previousAccount: AccountId20Like,
         proofs: Array<[FixedBytes<32>, SpRuntimeMultiSignature]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
@@ -5432,7 +5251,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proofs: Array<[FixedBytes<32>, SpRuntimeMultiSignature]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5441,15 +5261,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claim: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
             name: 'Claim';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5459,16 +5278,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} newRewardAccount
      **/
     updateRewardAddress: GenericTxCall<
-      Rv,
       (newRewardAccount: AccountId20Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
             name: 'UpdateRewardAddress';
             params: { newRewardAccount: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5481,16 +5299,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} leaseEndingBlock
      **/
     completeInitialization: GenericTxCall<
-      Rv,
       (leaseEndingBlock: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
             name: 'CompleteInitialization';
             params: { leaseEndingBlock: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5502,23 +5319,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[FixedBytes<32>, AccountId20Like | undefined, bigint]>} rewards
      **/
     initializeRewardVec: GenericTxCall<
-      Rv,
       (rewards: Array<[FixedBytes<32>, AccountId20Like | undefined, bigint]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CrowdloanRewards';
           palletCall: {
             name: 'InitializeRewardVec';
             params: { rewards: Array<[FixedBytes<32>, AccountId20Like | undefined, bigint]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -5530,19 +5346,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5572,14 +5387,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5591,7 +5404,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5633,14 +5447,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5652,7 +5464,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5670,19 +5483,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5698,19 +5510,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5724,16 +5535,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5746,16 +5556,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5770,16 +5579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5822,7 +5630,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5830,7 +5637,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5843,7 +5649,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5874,7 +5681,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5882,7 +5688,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5895,7 +5700,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5908,16 +5714,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5963,7 +5768,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -5971,7 +5775,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -5984,7 +5787,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6000,19 +5804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6075,7 +5878,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -6085,7 +5887,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -6100,7 +5901,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6121,19 +5923,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6144,16 +5945,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6163,22 +5963,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -6210,20 +6009,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: bigint,
         admin: AccountId20Like,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: bigint; admin: AccountId20Like; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6254,21 +6052,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: AccountId20Like,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: bigint; owner: AccountId20Like; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6289,16 +6086,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6319,16 +6115,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6349,16 +6144,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6377,16 +6171,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6409,20 +6202,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: bigint,
         beneficiary: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: bigint; beneficiary: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6448,20 +6240,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: bigint; who: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6490,20 +6281,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         target: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: bigint; target: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6532,20 +6322,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: bigint,
         target: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: bigint; target: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6576,21 +6365,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         source: AccountId20Like,
         dest: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: bigint; source: AccountId20Like; dest: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6612,19 +6400,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: bigint; who: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6644,19 +6431,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: bigint; who: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6674,16 +6460,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6701,16 +6486,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6730,19 +6514,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: bigint; owner: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6766,21 +6549,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: bigint,
         issuer: AccountId20Like,
         admin: AccountId20Like,
         freezer: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: bigint; issuer: AccountId20Like; admin: AccountId20Like; freezer: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6808,21 +6590,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: bigint,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: bigint; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6842,16 +6623,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6878,7 +6658,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: bigint,
         name: BytesLike,
@@ -6886,14 +6665,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: bigint; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6913,16 +6692,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6960,7 +6738,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: AccountId20Like,
@@ -6971,7 +6748,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -6987,7 +6763,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7018,20 +6795,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: bigint,
         delegate: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: bigint; delegate: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7054,19 +6830,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: bigint,
         delegate: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: bigint; delegate: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7090,20 +6865,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: AccountId20Like,
         delegate: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: bigint; owner: AccountId20Like; delegate: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7133,21 +6907,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: bigint,
         owner: AccountId20Like,
         destination: AccountId20Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: bigint; owner: AccountId20Like; destination: AccountId20Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7165,16 +6938,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7197,19 +6969,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: bigint,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: bigint; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7231,19 +7002,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: bigint,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: bigint; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7263,19 +7033,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: bigint; who: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7298,19 +7067,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: bigint; who: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7330,19 +7098,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: bigint,
         who: AccountId20Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: bigint; who: AccountId20Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7369,27 +7136,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: bigint,
         dest: AccountId20Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: bigint; dest: AccountId20Like; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmTransactor`'s transaction calls
@@ -7409,19 +7175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     register: GenericTxCall<
-      Rv,
       (
         who: AccountId20Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
             name: 'Register';
             params: { who: AccountId20Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7432,16 +7197,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     deregister: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
             name: 'Deregister';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7460,7 +7224,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} refund
      **/
     transactThroughDerivative: GenericTxCall<
-      Rv,
       (
         dest: MoonbeamRuntimeXcmConfigTransactors,
         index: number,
@@ -7469,7 +7232,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         weightInfo: PalletXcmTransactorTransactWeights,
         refund: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
@@ -7483,7 +7245,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               refund: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7502,7 +7265,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} refund
      **/
     transactThroughSovereign: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         feePayer: AccountId20Like | undefined,
@@ -7512,7 +7274,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         weightInfo: PalletXcmTransactorTransactWeights,
         refund: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
@@ -7527,7 +7288,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               refund: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7540,14 +7302,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight | undefined} transactExtraWeightSigned
      **/
     setTransactInfo: GenericTxCall<
-      Rv,
       (
         location: XcmVersionedLocation,
         transactExtraWeight: SpWeightsWeightV2Weight,
         maxWeight: SpWeightsWeightV2Weight,
         transactExtraWeightSigned: SpWeightsWeightV2Weight | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
@@ -7559,7 +7319,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               transactExtraWeightSigned: SpWeightsWeightV2Weight | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7569,16 +7330,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     removeTransactInfo: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
             name: 'RemoveTransactInfo';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7596,7 +7356,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} refund
      **/
     transactThroughSigned: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         fee: PalletXcmTransactorCurrencyPayment,
@@ -7604,7 +7363,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         weightInfo: PalletXcmTransactorTransactWeights,
         refund: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
@@ -7617,7 +7375,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               refund: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7628,19 +7387,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} feePerSecond
      **/
     setFeePerSecond: GenericTxCall<
-      Rv,
       (
         assetLocation: XcmVersionedLocation,
         feePerSecond: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
             name: 'SetFeePerSecond';
             params: { assetLocation: XcmVersionedLocation; feePerSecond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7650,16 +7408,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} assetLocation
      **/
     removeFeePerSecond: GenericTxCall<
-      Rv,
       (assetLocation: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
             name: 'RemoveFeePerSecond';
             params: { assetLocation: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7671,13 +7428,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXcmTransactorTransactWeights} weightInfo
      **/
     hrmpManage: GenericTxCall<
-      Rv,
       (
         action: PalletXcmTransactorHrmpOperation,
         fee: PalletXcmTransactorCurrencyPayment,
         weightInfo: PalletXcmTransactorTransactWeights,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmTransactor';
           palletCall: {
@@ -7688,14 +7443,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightInfo: PalletXcmTransactorTransactWeights;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EthereumXcm`'s transaction calls
@@ -7708,16 +7464,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmPrimitivesEthereumXcmEthereumXcmTransaction} xcmTransaction
      **/
     transact: GenericTxCall<
-      Rv,
       (xcmTransaction: XcmPrimitivesEthereumXcmEthereumXcmTransaction) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EthereumXcm';
           palletCall: {
             name: 'Transact';
             params: { xcmTransaction: XcmPrimitivesEthereumXcmEthereumXcmTransaction };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7729,19 +7484,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmPrimitivesEthereumXcmEthereumXcmTransaction} xcmTransaction
      **/
     transactThroughProxy: GenericTxCall<
-      Rv,
       (
         transactAs: H160,
         xcmTransaction: XcmPrimitivesEthereumXcmEthereumXcmTransaction,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EthereumXcm';
           palletCall: {
             name: 'TransactThroughProxy';
             params: { transactAs: H160; xcmTransaction: XcmPrimitivesEthereumXcmEthereumXcmTransaction };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7752,15 +7506,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendEthereumXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EthereumXcm';
           palletCall: {
             name: 'SuspendEthereumXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7771,15 +7524,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeEthereumXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EthereumXcm';
           palletCall: {
             name: 'ResumeEthereumXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7793,13 +7545,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160 | undefined} forceCreateAddress
      **/
     forceTransactAs: GenericTxCall<
-      Rv,
       (
         transactAs: H160,
         xcmTransaction: XcmPrimitivesEthereumXcmEthereumXcmTransaction,
         forceCreateAddress: H160 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EthereumXcm';
           palletCall: {
@@ -7810,14 +7560,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               forceCreateAddress: H160 | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -7830,19 +7581,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7867,14 +7617,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -7886,14 +7634,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EvmForeignAssets`'s transaction calls
@@ -7909,7 +7658,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} name
      **/
     createForeignAsset: GenericTxCall<
-      Rv,
       (
         assetId: bigint,
         assetXcmLocation: StagingXcmV5Location,
@@ -7917,7 +7665,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         symbol: BytesLike,
         name: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmForeignAssets';
           palletCall: {
@@ -7930,7 +7677,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               name: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7943,19 +7691,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} newXcmLocation
      **/
     changeXcmLocation: GenericTxCall<
-      Rv,
       (
         assetId: bigint,
         newXcmLocation: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmForeignAssets';
           palletCall: {
             name: 'ChangeXcmLocation';
             params: { assetId: bigint; newXcmLocation: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7966,19 +7713,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowXcmDeposit
      **/
     freezeForeignAsset: GenericTxCall<
-      Rv,
       (
         assetId: bigint,
         allowXcmDeposit: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmForeignAssets';
           palletCall: {
             name: 'FreezeForeignAsset';
             params: { assetId: bigint; allowXcmDeposit: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7988,23 +7734,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} assetId
      **/
     unfreezeForeignAsset: GenericTxCall<
-      Rv,
       (assetId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmForeignAssets';
           palletCall: {
             name: 'UnfreezeForeignAsset';
             params: { assetId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmWeightTrader`'s transaction calls
@@ -8016,19 +7761,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} relativePrice
      **/
     addAsset: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         relativePrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmWeightTrader';
           palletCall: {
             name: 'AddAsset';
             params: { location: StagingXcmV5Location; relativePrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8038,19 +7782,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} relativePrice
      **/
     editAsset: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         relativePrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmWeightTrader';
           palletCall: {
             name: 'EditAsset';
             params: { location: StagingXcmV5Location; relativePrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8059,16 +7802,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} location
      **/
     pauseAssetSupport: GenericTxCall<
-      Rv,
       (location: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmWeightTrader';
           palletCall: {
             name: 'PauseAssetSupport';
             params: { location: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8077,16 +7819,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} location
      **/
     resumeAssetSupport: GenericTxCall<
-      Rv,
       (location: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmWeightTrader';
           palletCall: {
             name: 'ResumeAssetSupport';
             params: { location: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8095,23 +7836,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} location
      **/
     removeAsset: GenericTxCall<
-      Rv,
       (location: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmWeightTrader';
           palletCall: {
             name: 'RemoveAsset';
             params: { location: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EmergencyParaXcm`'s transaction calls
@@ -8122,15 +7862,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pausedToNormal: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmergencyParaXcm';
           palletCall: {
             name: 'PausedToNormal';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8140,23 +7879,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     fastAuthorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmergencyParaXcm';
           palletCall: {
             name: 'FastAuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -8172,16 +7910,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8198,20 +7935,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8223,15 +7959,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8245,23 +7980,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Randomness`'s transaction calls
@@ -8272,20 +8006,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setBabeRandomnessResults: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Randomness';
           palletCall: 'SetBabeRandomnessResults';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `BridgeKusamaGrandpa`'s transaction calls
@@ -8300,19 +8033,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpHeaderChainJustificationGrandpaJustification} justification
      **/
     submitFinalityProof: GenericTxCall<
-      Rv,
       (
         finalityTarget: Header,
         justification: BpHeaderChainJustificationGrandpaJustification,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
             name: 'SubmitFinalityProof';
             params: { finalityTarget: Header; justification: BpHeaderChainJustificationGrandpaJustification };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8330,16 +8062,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpHeaderChainInitializationData} initData
      **/
     initialize: GenericTxCall<
-      Rv,
       (initData: BpHeaderChainInitializationData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
             name: 'Initialize';
             params: { initData: BpHeaderChainInitializationData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8351,16 +8082,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like | undefined} newOwner
      **/
     setOwner: GenericTxCall<
-      Rv,
       (newOwner: AccountId20Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
             name: 'SetOwner';
             params: { newOwner: AccountId20Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8372,16 +8102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpRuntimeBasicOperatingMode} operatingMode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (operatingMode: BpRuntimeBasicOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
             name: 'SetOperatingMode';
             params: { operatingMode: BpRuntimeBasicOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8420,14 +8149,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFreeExecutionExpected
      **/
     submitFinalityProofEx: GenericTxCall<
-      Rv,
       (
         finalityTarget: Header,
         justification: BpHeaderChainJustificationGrandpaJustification,
         currentSetId: bigint,
         isFreeExecutionExpected: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
@@ -8439,7 +8166,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFreeExecutionExpected: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8459,13 +8187,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Header} newBestHeader
      **/
     forceSetPalletState: GenericTxCall<
-      Rv,
       (
         newCurrentSetId: bigint,
         newAuthorities: Array<[SpConsensusGrandpaAppPublic, bigint]>,
         newBestHeader: Header,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaGrandpa';
           palletCall: {
@@ -8476,14 +8202,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBestHeader: Header;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `BridgeKusamaParachains`'s transaction calls
@@ -8512,13 +8239,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpPolkadotCoreParachainsParaHeadsProof} parachainHeadsProof
      **/
     submitParachainHeads: GenericTxCall<
-      Rv,
       (
         atRelayBlock: [number, H256],
         parachains: Array<[BpPolkadotCoreParachainsParaId, H256]>,
         parachainHeadsProof: BpPolkadotCoreParachainsParaHeadsProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaParachains';
           palletCall: {
@@ -8529,7 +8254,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               parachainHeadsProof: BpPolkadotCoreParachainsParaHeadsProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8541,16 +8267,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like | undefined} newOwner
      **/
     setOwner: GenericTxCall<
-      Rv,
       (newOwner: AccountId20Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaParachains';
           palletCall: {
             name: 'SetOwner';
             params: { newOwner: AccountId20Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8562,16 +8287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpRuntimeBasicOperatingMode} operatingMode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (operatingMode: BpRuntimeBasicOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaParachains';
           palletCall: {
             name: 'SetOperatingMode';
             params: { operatingMode: BpRuntimeBasicOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8605,14 +8329,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFreeExecutionExpected
      **/
     submitParachainHeadsEx: GenericTxCall<
-      Rv,
       (
         atRelayBlock: [number, H256],
         parachains: Array<[BpPolkadotCoreParachainsParaId, H256]>,
         parachainHeadsProof: BpPolkadotCoreParachainsParaHeadsProof,
         isFreeExecutionExpected: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaParachains';
           palletCall: {
@@ -8624,14 +8346,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFreeExecutionExpected: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `BridgeKusamaMessages`'s transaction calls
@@ -8645,16 +8368,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId20Like | undefined} newOwner
      **/
     setOwner: GenericTxCall<
-      Rv,
       (newOwner: AccountId20Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaMessages';
           palletCall: {
             name: 'SetOwner';
             params: { newOwner: AccountId20Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8666,16 +8388,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpMessagesMessagesOperatingMode} operatingMode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (operatingMode: BpMessagesMessagesOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaMessages';
           palletCall: {
             name: 'SetOperatingMode';
             params: { operatingMode: BpMessagesMessagesOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8708,14 +8429,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} dispatchWeight
      **/
     receiveMessagesProof: GenericTxCall<
-      Rv,
       (
         relayerIdAtBridgedChain: AccountId20Like,
         proof: BpMessagesTargetChainFromBridgedChainMessagesProof,
         messagesCount: number,
         dispatchWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaMessages';
           palletCall: {
@@ -8727,7 +8446,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               dispatchWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8738,12 +8458,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BpMessagesUnrewardedRelayersState} relayersState
      **/
     receiveMessagesDeliveryProof: GenericTxCall<
-      Rv,
       (
         proof: BpMessagesSourceChainFromBridgedChainMessagesDeliveryProof,
         relayersState: BpMessagesUnrewardedRelayersState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeKusamaMessages';
           palletCall: {
@@ -8753,14 +8471,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               relayersState: BpMessagesUnrewardedRelayersState;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `BridgeXcmOverMoonriver`'s transaction calls
@@ -8782,16 +8501,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedInteriorLocation} bridgeDestinationUniversalLocation
      **/
     openBridge: GenericTxCall<
-      Rv,
       (bridgeDestinationUniversalLocation: XcmVersionedInteriorLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeXcmOverMoonriver';
           palletCall: {
             name: 'OpenBridge';
             params: { bridgeDestinationUniversalLocation: XcmVersionedInteriorLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8818,25 +8536,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} mayPruneMessages
      **/
     closeBridge: GenericTxCall<
-      Rv,
       (
         bridgeDestinationUniversalLocation: XcmVersionedInteriorLocation,
         mayPruneMessages: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BridgeXcmOverMoonriver';
           palletCall: {
             name: 'CloseBridge';
             params: { bridgeDestinationUniversalLocation: XcmVersionedInteriorLocation; mayPruneMessages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/moonbeam/view-functions.d.ts b/packages/chaintypes/src/moonbeam/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/moonbeam/view-functions.d.ts
+++ b/packages/chaintypes/src/moonbeam/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/paseo-asset-hub/consts.d.ts b/packages/chaintypes/src/paseo-asset-hub/consts.d.ts
index 42c55a8a..32f8e90a 100644
--- a/packages/chaintypes/src/paseo-asset-hub/consts.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Bytes, AccountId32, Permill, Perbill } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -15,7 +15,7 @@ import type {
   PalletReferendaTrackDetails,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/paseo-asset-hub/errors.d.ts b/packages/chaintypes/src/paseo-asset-hub/errors.d.ts
index d5b81d4a..86bba950 100644
--- a/packages/chaintypes/src/paseo-asset-hub/errors.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,65 +11,65 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * The specified [`Task`] is not valid.
      **/
-    InvalidTask: GenericPalletError<Rv>;
+    InvalidTask: GenericPalletError;
 
     /**
      * The specified [`Task`] failed during execution.
      **/
-    FailedTask: GenericPalletError<Rv>;
+    FailedTask: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -78,38 +78,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -118,47 +118,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -167,32 +167,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -201,12 +201,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -215,67 +215,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -284,33 +284,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -319,38 +319,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -359,92 +359,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -453,32 +453,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -487,32 +487,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -522,152 +522,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -677,32 +677,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -710,24 +710,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s errors
@@ -736,73 +736,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Convert versioned location failure
      **/
-    UnsupportedLocationVersion: GenericPalletError<Rv>;
+    UnsupportedLocationVersion: GenericPalletError;
 
     /**
      * Check location failure, should start from the dispatch origin as owner
      **/
-    InvalidAssetOwner: GenericPalletError<Rv>;
+    InvalidAssetOwner: GenericPalletError;
 
     /**
      * Send xcm message failure
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * Withdraw fee asset failure
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * Convert to reanchored location failure
      **/
-    LocationConversionFailed: GenericPalletError<Rv>;
+    LocationConversionFailed: GenericPalletError;
 
     /**
      * Message export is halted
      **/
-    Halted: GenericPalletError<Rv>;
+    Halted: GenericPalletError;
 
     /**
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The asset provided for the tip is unsupported.
      **/
-    UnsupportedAsset: GenericPalletError<Rv>;
+    UnsupportedAsset: GenericPalletError;
 
     /**
      * Unable to withdraw asset.
      **/
-    WithdrawError: GenericPalletError<Rv>;
+    WithdrawError: GenericPalletError;
 
     /**
      * Account could not be converted to a location.
      **/
-    InvalidAccount: GenericPalletError<Rv>;
+    InvalidAccount: GenericPalletError;
 
     /**
      * Provided tip asset could not be swapped for ether.
      **/
-    SwapError: GenericPalletError<Rv>;
+    SwapError: GenericPalletError;
 
     /**
      * Ether could not be burned.
      **/
-    BurnError: GenericPalletError<Rv>;
+    BurnError: GenericPalletError;
 
     /**
      * The tip provided is zero.
      **/
-    TipAmountZero: GenericPalletError<Rv>;
+    TipAmountZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -811,12 +811,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -825,78 +825,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -905,47 +905,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -954,32 +954,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -988,125 +988,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -1115,117 +1115,117 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * No metadata is found.
      **/
-    NoMetadata: GenericPalletError<Rv>;
+    NoMetadata: GenericPalletError;
 
     /**
      * Wrong metadata key/value bytes supplied.
      **/
-    WrongMetadata: GenericPalletError<Rv>;
+    WrongMetadata: GenericPalletError;
 
     /**
      * An attribute is not found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Wrong attribute key/value bytes supplied.
      **/
-    WrongAttribute: GenericPalletError<Rv>;
+    WrongAttribute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nfts`'s errors
@@ -1234,232 +1234,232 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The approval had a deadline that expired, so the approval isn't valid anymore.
      **/
-    ApprovalExpired: GenericPalletError<Rv>;
+    ApprovalExpired: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * The witness data given does not match the current state of the chain.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Collection ID is already taken.
      **/
-    CollectionIdInUse: GenericPalletError<Rv>;
+    CollectionIdInUse: GenericPalletError;
 
     /**
      * Items within that collection are non-transferable.
      **/
-    ItemsNonTransferable: GenericPalletError<Rv>;
+    ItemsNonTransferable: GenericPalletError;
 
     /**
      * The provided account is not a delegate.
      **/
-    NotDelegate: GenericPalletError<Rv>;
+    NotDelegate: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership acceptance of the collection.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked (non-transferable).
      **/
-    ItemLocked: GenericPalletError<Rv>;
+    ItemLocked: GenericPalletError;
 
     /**
      * Item's attributes are locked.
      **/
-    LockedItemAttributes: GenericPalletError<Rv>;
+    LockedItemAttributes: GenericPalletError;
 
     /**
      * Collection's attributes are locked.
      **/
-    LockedCollectionAttributes: GenericPalletError<Rv>;
+    LockedCollectionAttributes: GenericPalletError;
 
     /**
      * Item's metadata is locked.
      **/
-    LockedItemMetadata: GenericPalletError<Rv>;
+    LockedItemMetadata: GenericPalletError;
 
     /**
      * Collection's metadata is locked.
      **/
-    LockedCollectionMetadata: GenericPalletError<Rv>;
+    LockedCollectionMetadata: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply is locked and can't be changed.
      **/
-    MaxSupplyLocked: GenericPalletError<Rv>;
+    MaxSupplyLocked: GenericPalletError;
 
     /**
      * The provided max supply is less than the number of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Swap doesn't exist.
      **/
-    UnknownSwap: GenericPalletError<Rv>;
+    UnknownSwap: GenericPalletError;
 
     /**
      * The given item has no metadata set.
      **/
-    MetadataNotFound: GenericPalletError<Rv>;
+    MetadataNotFound: GenericPalletError;
 
     /**
      * The provided attribute can't be found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * The item has reached its approval limit.
      **/
-    ReachedApprovalLimit: GenericPalletError<Rv>;
+    ReachedApprovalLimit: GenericPalletError;
 
     /**
      * The deadline has already expired.
      **/
-    DeadlineExpired: GenericPalletError<Rv>;
+    DeadlineExpired: GenericPalletError;
 
     /**
      * The duration provided should be less than or equal to `MaxDeadlineDuration`.
      **/
-    WrongDuration: GenericPalletError<Rv>;
+    WrongDuration: GenericPalletError;
 
     /**
      * The method is disabled by system settings.
      **/
-    MethodDisabled: GenericPalletError<Rv>;
+    MethodDisabled: GenericPalletError;
 
     /**
      * The provided setting can't be set.
      **/
-    WrongSetting: GenericPalletError<Rv>;
+    WrongSetting: GenericPalletError;
 
     /**
      * Item's config already exists and should be equal to the provided one.
      **/
-    InconsistentItemConfig: GenericPalletError<Rv>;
+    InconsistentItemConfig: GenericPalletError;
 
     /**
      * Config for a collection or an item can't be found.
      **/
-    NoConfig: GenericPalletError<Rv>;
+    NoConfig: GenericPalletError;
 
     /**
      * Some roles were not cleared.
      **/
-    RolesNotCleared: GenericPalletError<Rv>;
+    RolesNotCleared: GenericPalletError;
 
     /**
      * Mint has not started yet.
      **/
-    MintNotStarted: GenericPalletError<Rv>;
+    MintNotStarted: GenericPalletError;
 
     /**
      * Mint has already ended.
      **/
-    MintEnded: GenericPalletError<Rv>;
+    MintEnded: GenericPalletError;
 
     /**
      * The provided Item was already used for claiming.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * The provided data is incorrect.
      **/
-    IncorrectData: GenericPalletError<Rv>;
+    IncorrectData: GenericPalletError;
 
     /**
      * The extrinsic was sent by the wrong origin.
      **/
-    WrongOrigin: GenericPalletError<Rv>;
+    WrongOrigin: GenericPalletError;
 
     /**
      * The provided signature is incorrect.
      **/
-    WrongSignature: GenericPalletError<Rv>;
+    WrongSignature: GenericPalletError;
 
     /**
      * The provided metadata might be too long.
      **/
-    IncorrectMetadata: GenericPalletError<Rv>;
+    IncorrectMetadata: GenericPalletError;
 
     /**
      * Can't set more attributes per one call.
      **/
-    MaxAttributesLimitReached: GenericPalletError<Rv>;
+    MaxAttributesLimitReached: GenericPalletError;
 
     /**
      * The provided namespace isn't supported in this call.
      **/
-    WrongNamespace: GenericPalletError<Rv>;
+    WrongNamespace: GenericPalletError;
 
     /**
      * Can't delete non-empty collections.
      **/
-    CollectionNotEmpty: GenericPalletError<Rv>;
+    CollectionNotEmpty: GenericPalletError;
 
     /**
      * The witness data should be provided.
      **/
-    WitnessRequired: GenericPalletError<Rv>;
+    WitnessRequired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ForeignAssets`'s errors
@@ -1468,125 +1468,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssets`'s errors
@@ -1595,125 +1595,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversion`'s errors
@@ -1722,125 +1722,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Pool already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Desired amount can't be zero.
      **/
-    WrongDesiredAmount: GenericPalletError<Rv>;
+    WrongDesiredAmount: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountOneLessThanMinimal: GenericPalletError<Rv>;
+    AmountOneLessThanMinimal: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountTwoLessThanMinimal: GenericPalletError<Rv>;
+    AmountTwoLessThanMinimal: GenericPalletError;
 
     /**
      * Reserve needs to always be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    ReserveLeftLessThanMinimal: GenericPalletError<Rv>;
+    ReserveLeftLessThanMinimal: GenericPalletError;
 
     /**
      * Desired amount can't be equal to the pool reserve.
      **/
-    AmountOutTooHigh: GenericPalletError<Rv>;
+    AmountOutTooHigh: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An overflow happened.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * Optimal calculated amount is less than desired.
      **/
-    OptimalAmountLessThanDesired: GenericPalletError<Rv>;
+    OptimalAmountLessThanDesired: GenericPalletError;
 
     /**
      * Insufficient liquidity minted.
      **/
-    InsufficientLiquidityMinted: GenericPalletError<Rv>;
+    InsufficientLiquidityMinted: GenericPalletError;
 
     /**
      * Requested liquidity can't be zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * Amount can't be zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Calculated amount out is less than provided minimum amount.
      **/
-    ProvidedMinimumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMinimumNotSufficientForSwap: GenericPalletError;
 
     /**
      * Provided maximum amount is not sufficient for swap.
      **/
-    ProvidedMaximumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMaximumNotSufficientForSwap: GenericPalletError;
 
     /**
      * The provided path must consists of 2 assets at least.
      **/
-    InvalidPath: GenericPalletError<Rv>;
+    InvalidPath: GenericPalletError;
 
     /**
      * The provided path must consists of unique assets.
      **/
-    NonUniquePath: GenericPalletError<Rv>;
+    NonUniquePath: GenericPalletError;
 
     /**
      * It was not possible to get or increment the Id of the pool.
      **/
-    IncorrectPoolAssetId: GenericPalletError<Rv>;
+    IncorrectPoolAssetId: GenericPalletError;
 
     /**
      * The destination account cannot exist with the swapped funds.
      **/
-    BelowMinimum: GenericPalletError<Rv>;
+    BelowMinimum: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -1849,63 +1849,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -1914,68 +1914,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1984,77 +1984,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -2063,32 +2063,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -2097,68 +2097,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -2167,22 +2167,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2191,22 +2191,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2215,7 +2215,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2226,32 +2226,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -2260,44 +2260,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -2306,160 +2306,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -2468,17 +2468,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -2487,17 +2487,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -2506,52 +2506,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElection`'s errors
@@ -2560,22 +2560,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Triggering the `Fallback` failed.
      **/
-    Fallback: GenericPalletError<Rv>;
+    Fallback: GenericPalletError;
 
     /**
      * Unexpected phase
      **/
-    UnexpectedPhase: GenericPalletError<Rv>;
+    UnexpectedPhase: GenericPalletError;
 
     /**
      * Snapshot was unavailable.
      **/
-    Snapshot: GenericPalletError<Rv>;
+    Snapshot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s errors
@@ -2584,52 +2584,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The phase is not signed.
      **/
-    PhaseNotSigned: GenericPalletError<Rv>;
+    PhaseNotSigned: GenericPalletError;
 
     /**
      * The submission is a duplicate.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * The queue is full.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The page index is out of bounds.
      **/
-    BadPageIndex: GenericPalletError<Rv>;
+    BadPageIndex: GenericPalletError;
 
     /**
      * The account is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * No submission found.
      **/
-    NoSubmission: GenericPalletError<Rv>;
+    NoSubmission: GenericPalletError;
 
     /**
      * Round is not yet over.
      **/
-    RoundNotOver: GenericPalletError<Rv>;
+    RoundNotOver: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitnessData: GenericPalletError<Rv>;
+    BadWitnessData: GenericPalletError;
 
     /**
      * Too many invulnerable accounts are provided,
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -2638,193 +2638,193 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record not found.
      **/
-    InvalidSlashRecord: GenericPalletError<Rv>;
+    InvalidSlashRecord: GenericPalletError;
 
     /**
      * Cannot bond, nominate or validate with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Era not yet started.
      **/
-    EraNotStarted: GenericPalletError<Rv>;
+    EraNotStarted: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Unapplied slashes in the recently concluded era is blocking this operation.
      * See `Call::apply_slash` to apply them.
      **/
-    UnappliedSlashesInPreviousEra: GenericPalletError<Rv>;
+    UnappliedSlashesInPreviousEra: GenericPalletError;
 
     /**
      * The era is not eligible for pruning.
      **/
-    EraNotPrunable: GenericPalletError<Rv>;
+    EraNotPrunable: GenericPalletError;
 
     /**
      * The slash has been cancelled and cannot be applied.
      **/
-    CancelledSlash: GenericPalletError<Rv>;
+    CancelledSlash: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Revive`'s errors
@@ -2833,122 +2833,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * Event body or storage item exceeds [`limits::PAYLOAD_BYTES`].
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract called into the runtime which then called back into this pallet.
      **/
-    ReenteredPallet: GenericPalletError<Rv>;
+    ReenteredPallet: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -2956,7 +2956,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract failed to compile or is missing the correct entry points.
@@ -2964,120 +2964,120 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::revive=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * The code blob supplied is larger than [`limits::code::BLOB_BYTES`].
      **/
-    BlobTooLarge: GenericPalletError<Rv>;
+    BlobTooLarge: GenericPalletError;
 
     /**
      * The contract declares too much memory (ro + rw + stack).
      **/
-    StaticMemoryTooLarge: GenericPalletError<Rv>;
+    StaticMemoryTooLarge: GenericPalletError;
 
     /**
      * The program contains a basic block that is larger than allowed.
      **/
-    BasicBlockTooLarge: GenericPalletError<Rv>;
+    BasicBlockTooLarge: GenericPalletError;
 
     /**
      * The program contains an invalid instruction.
      **/
-    InvalidInstruction: GenericPalletError<Rv>;
+    InvalidInstruction: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * The contract tried to call a syscall which does not exist (at its current api level).
      **/
-    InvalidSyscall: GenericPalletError<Rv>;
+    InvalidSyscall: GenericPalletError;
 
     /**
      * Invalid storage flags were passed to one of the storage syscalls.
      **/
-    InvalidStorageFlags: GenericPalletError<Rv>;
+    InvalidStorageFlags: GenericPalletError;
 
     /**
      * PolkaVM failed during code execution. Probably due to a malformed program.
      **/
-    ExecutionFailed: GenericPalletError<Rv>;
+    ExecutionFailed: GenericPalletError;
 
     /**
      * Failed to convert a U256 to a Balance.
      **/
-    BalanceConversionFailed: GenericPalletError<Rv>;
+    BalanceConversionFailed: GenericPalletError;
 
     /**
      * Immutable data can only be set during deploys and only be read during calls.
      * Additionally, it is only valid to set the data once and it must not be empty.
      **/
-    InvalidImmutableAccess: GenericPalletError<Rv>;
+    InvalidImmutableAccess: GenericPalletError;
 
     /**
      * An `AccountID32` account tried to interact with the pallet without having a mapping.
      *
      * Call [`Pallet::map_account`] in order to create a mapping for the account.
      **/
-    AccountUnmapped: GenericPalletError<Rv>;
+    AccountUnmapped: GenericPalletError;
 
     /**
      * Tried to map an account that is already mapped.
      **/
-    AccountAlreadyMapped: GenericPalletError<Rv>;
+    AccountAlreadyMapped: GenericPalletError;
 
     /**
      * The transaction used to dry-run a contract is invalid.
      **/
-    InvalidGenericTransaction: GenericPalletError<Rv>;
+    InvalidGenericTransaction: GenericPalletError;
 
     /**
      * The refcount of a code either over or underflowed.
      **/
-    RefcountOverOrUnderflow: GenericPalletError<Rv>;
+    RefcountOverOrUnderflow: GenericPalletError;
 
     /**
      * Unsupported precompile address.
      **/
-    UnsupportedPrecompileAddress: GenericPalletError<Rv>;
+    UnsupportedPrecompileAddress: GenericPalletError;
 
     /**
      * The calldata exceeds [`limits::CALLDATA_BYTES`].
      **/
-    CallDataTooLarge: GenericPalletError<Rv>;
+    CallDataTooLarge: GenericPalletError;
 
     /**
      * The return data exceeds [`limits::CALLDATA_BYTES`].
      **/
-    ReturnDataTooLarge: GenericPalletError<Rv>;
+    ReturnDataTooLarge: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -3086,12 +3086,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhOps`'s errors
@@ -3100,62 +3100,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Either no lease deposit or already unreserved.
      **/
-    NoLeaseReserve: GenericPalletError<Rv>;
+    NoLeaseReserve: GenericPalletError;
 
     /**
      * Either no crowdloan contribution or already withdrawn.
      **/
-    NoCrowdloanContribution: GenericPalletError<Rv>;
+    NoCrowdloanContribution: GenericPalletError;
 
     /**
      * Either no crowdloan reserve or already unreserved.
      **/
-    NoCrowdloanReserve: GenericPalletError<Rv>;
+    NoCrowdloanReserve: GenericPalletError;
 
     /**
      * Failed to withdraw crowdloan contribution.
      **/
-    FailedToWithdrawCrowdloanContribution: GenericPalletError<Rv>;
+    FailedToWithdrawCrowdloanContribution: GenericPalletError;
 
     /**
      * Block number is not yet reached.
      **/
-    NotYet: GenericPalletError<Rv>;
+    NotYet: GenericPalletError;
 
     /**
      * Not all contributions are withdrawn.
      **/
-    ContributionsRemaining: GenericPalletError<Rv>;
+    ContributionsRemaining: GenericPalletError;
 
     /**
      * The account is not a derived account.
      **/
-    WrongDerivedTranslation: GenericPalletError<Rv>;
+    WrongDerivedTranslation: GenericPalletError;
 
     /**
      * Account cannot be migrated since it is not a sovereign parachain account.
      **/
-    NotSovereign: GenericPalletError<Rv>;
+    NotSovereign: GenericPalletError;
 
     /**
      * Internal error, please bug report.
      **/
-    InternalError: GenericPalletError<Rv>;
+    InternalError: GenericPalletError;
 
     /**
      * The Asset Hub migration is not completed.
      **/
-    MigrationNotCompleted: GenericPalletError<Rv>;
+    MigrationNotCompleted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhMigrator`'s errors
@@ -3164,101 +3164,101 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to unreserve deposit.
      **/
-    FailedToUnreserveDeposit: GenericPalletError<Rv>;
+    FailedToUnreserveDeposit: GenericPalletError;
 
     /**
      * Failed to process an account data from RC.
      **/
-    FailedToProcessAccount: GenericPalletError<Rv>;
+    FailedToProcessAccount: GenericPalletError;
 
     /**
      * Some item could not be inserted because it already exists.
      **/
-    InsertConflict: GenericPalletError<Rv>;
+    InsertConflict: GenericPalletError;
 
     /**
      * Failed to convert RC type to AH type.
      **/
-    FailedToConvertType: GenericPalletError<Rv>;
+    FailedToConvertType: GenericPalletError;
 
     /**
      * Failed to fetch preimage.
      **/
-    PreimageNotFound: GenericPalletError<Rv>;
+    PreimageNotFound: GenericPalletError;
 
     /**
      * Failed to convert RC call to AH call.
      **/
-    FailedToConvertCall: GenericPalletError<Rv>;
+    FailedToConvertCall: GenericPalletError;
 
     /**
      * Failed to bound a call.
      **/
-    FailedToBoundCall: GenericPalletError<Rv>;
+    FailedToBoundCall: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to integrate a vesting schedule.
      **/
-    FailedToIntegrateVestingSchedule: GenericPalletError<Rv>;
+    FailedToIntegrateVestingSchedule: GenericPalletError;
 
     /**
      * Checking account overflow or underflow.
      **/
-    FailedToCalculateCheckingAccount: GenericPalletError<Rv>;
+    FailedToCalculateCheckingAccount: GenericPalletError;
 
     /**
      * Vector did not fit into its compile-time bound.
      **/
-    FailedToBoundVector: GenericPalletError<Rv>;
+    FailedToBoundVector: GenericPalletError;
 
     /**
      * The DMP queue priority is already set to the same value.
      **/
-    DmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    DmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * Preimage missing.
      **/
-    PreimageMissing: GenericPalletError<Rv>;
+    PreimageMissing: GenericPalletError;
 
     /**
      * Preimage too big.
      **/
-    PreimageTooBig: GenericPalletError<Rv>;
+    PreimageTooBig: GenericPalletError;
 
     /**
      * Preimage chunk missing.
      **/
-    PreimageChunkMissing: GenericPalletError<Rv>;
+    PreimageChunkMissing: GenericPalletError;
 
     /**
      * Preimage status invalid.
      **/
-    PreimageStatusInvalid: GenericPalletError<Rv>;
+    PreimageStatusInvalid: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/events.d.ts b/packages/chaintypes/src/paseo-asset-hub/events.d.ts
index 850515ea..8c2308b2 100644
--- a/packages/chaintypes/src/paseo-asset-hub/events.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -67,7 +67,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -75,18 +75,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -95,38 +89,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * A [`Task`] has started executing
      **/
-    TaskStarted: GenericPalletEvent<Rv, 'System', 'TaskStarted', { task: AssetHubPaseoRuntimeRuntimeTask }>;
+    TaskStarted: GenericPalletEvent<'System', 'TaskStarted', { task: AssetHubPaseoRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] has finished executing.
      **/
-    TaskCompleted: GenericPalletEvent<Rv, 'System', 'TaskCompleted', { task: AssetHubPaseoRuntimeRuntimeTask }>;
+    TaskCompleted: GenericPalletEvent<'System', 'TaskCompleted', { task: AssetHubPaseoRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] failed during execution.
      **/
     TaskFailed: GenericPalletEvent<
-      Rv,
       'System',
       'TaskFailed',
       { task: AssetHubPaseoRuntimeRuntimeTask; err: DispatchError }
@@ -135,13 +128,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -150,7 +142,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -159,13 +151,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -174,18 +165,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -195,7 +185,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -204,7 +193,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -213,22 +202,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -237,18 +226,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -258,7 +246,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -268,7 +255,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -278,7 +264,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -288,7 +273,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -299,7 +283,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -309,7 +292,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -318,12 +300,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -335,7 +317,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -359,7 +340,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -371,7 +352,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -390,20 +370,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -418,7 +397,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -438,7 +416,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -460,7 +437,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -480,7 +456,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -494,7 +469,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -503,40 +478,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -545,87 +519,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -636,7 +610,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -645,7 +618,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetTxPayment`'s events
@@ -656,7 +629,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who` in an asset `asset_id`.
      **/
     AssetTxFeePaid: GenericPalletEvent<
-      Rv,
       'AssetTxPayment',
       'AssetTxFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint; assetId: StagingXcmV5Location }
@@ -665,12 +637,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A swap of the refund in native currency back to asset failed.
      **/
-    AssetRefundFailed: GenericPalletEvent<Rv, 'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
+    AssetRefundFailed: GenericPalletEvent<'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -679,28 +651,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -710,7 +677,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -719,7 +685,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -729,7 +695,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -738,18 +703,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -758,13 +722,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -774,7 +737,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -783,13 +745,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -800,7 +761,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -809,7 +769,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -819,28 +779,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -849,12 +809,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -863,13 +823,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -884,7 +843,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -899,7 +857,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -911,7 +868,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -922,7 +878,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -933,7 +888,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -945,7 +899,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -962,7 +915,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -974,7 +926,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -986,7 +937,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -1002,7 +952,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1011,13 +960,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1029,7 +977,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1040,7 +987,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -1051,7 +997,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -1062,7 +1007,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -1078,7 +1022,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1090,7 +1033,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -1106,7 +1048,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1116,7 +1057,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1127,7 +1067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1137,7 +1076,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -1147,7 +1085,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1156,14 +1093,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -1173,7 +1109,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -1183,7 +1118,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -1192,7 +1126,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -1202,29 +1136,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s events
@@ -1234,7 +1163,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been decreased.
      **/
     DeliveryFeeFactorDecreased: GenericPalletEvent<
-      Rv,
       'ToKusamaXcmRouter',
       'DeliveryFeeFactorDecreased',
       {
@@ -1249,7 +1177,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been increased.
      **/
     DeliveryFeeFactorIncreased: GenericPalletEvent<
-      Rv,
       'ToKusamaXcmRouter',
       'DeliveryFeeFactorIncreased',
       {
@@ -1263,7 +1190,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -1273,7 +1200,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -1301,7 +1227,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1336,7 +1261,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1366,7 +1290,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1385,7 +1308,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s events
@@ -1395,7 +1318,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM was sent
      **/
     MessageSent: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'MessageSent',
       {
@@ -1410,7 +1332,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set OperatingMode
      **/
     ExportOperatingModeChanged: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'ExportOperatingModeChanged',
       { mode: SnowbridgeCoreOperatingModeBasicOperatingMode }
@@ -1419,7 +1340,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1429,47 +1350,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1479,7 +1400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1489,7 +1409,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1499,7 +1418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1515,7 +1433,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1525,7 +1442,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1534,7 +1450,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1543,14 +1459,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: AssetHubPaseoRuntimeProxyType; disambiguationIndex: number }
@@ -1560,7 +1475,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       { pure: AccountId32; spawner: AccountId32; proxyType: AssetHubPaseoRuntimeProxyType; disambiguationIndex: number }
@@ -1569,13 +1483,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubPaseoRuntimeProxyType; delay: number }
@@ -1585,7 +1498,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubPaseoRuntimeProxyType; delay: number }
@@ -1595,7 +1507,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1604,7 +1515,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -1613,23 +1524,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -1638,7 +1548,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -1647,18 +1557,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -1667,13 +1576,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1682,33 +1590,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -1718,7 +1625,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -1727,23 +1633,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -1752,13 +1657,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -1768,7 +1672,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -1779,7 +1682,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -1788,13 +1690,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -1803,27 +1704,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -1832,33 +1733,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -1867,38 +1762,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: number; item: number }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: number; item: number }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: number; item: number }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: number; item: number }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: number }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: number }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: number }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1909,7 +1803,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1920,7 +1813,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1929,13 +1821,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: number }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: number; data: Bytes; isFrozen: boolean }
@@ -1944,13 +1835,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: number; item: number; data: Bytes; isFrozen: boolean }
@@ -1959,23 +1849,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: number; item: number }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: number; item: number }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: number; successfulItems: Array<number> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: number; maybeItem?: number | undefined; key: Bytes; value: Bytes }
@@ -1985,7 +1869,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes }
@@ -1995,7 +1878,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2005,7 +1887,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2015,7 +1896,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2024,13 +1904,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2039,7 +1918,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nfts`'s events
@@ -2048,33 +1927,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Nfts', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Nfts', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Nfts', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Nfts',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -2083,23 +1956,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` became non-transferable.
      **/
-    ItemTransferLocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
+    ItemTransferLocked: GenericPalletEvent<'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
 
     /**
      * An `item` became transferable.
      **/
-    ItemTransferUnlocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
+    ItemTransferUnlocked: GenericPalletEvent<'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
 
     /**
      * `item` metadata or attributes were locked.
      **/
     ItemPropertiesLocked: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPropertiesLocked',
       { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean }
@@ -2108,18 +1980,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some `collection` was locked.
      **/
-    CollectionLocked: GenericPalletEvent<Rv, 'Nfts', 'CollectionLocked', { collection: number }>;
+    CollectionLocked: GenericPalletEvent<'Nfts', 'CollectionLocked', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TeamChanged',
       {
@@ -2135,7 +2006,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     TransferApproved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TransferApproved',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32; deadline?: number | undefined }
@@ -2146,7 +2016,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2156,7 +2025,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All approvals of an item got cancelled.
      **/
     AllApprovalsCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AllApprovalsCancelled',
       { collection: number; item: number; owner: AccountId32 }
@@ -2165,43 +2033,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its config changed by the `Force` origin.
      **/
-    CollectionConfigChanged: GenericPalletEvent<Rv, 'Nfts', 'CollectionConfigChanged', { collection: number }>;
+    CollectionConfigChanged: GenericPalletEvent<'Nfts', 'CollectionConfigChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
-    CollectionMetadataSet: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
+    CollectionMetadataSet: GenericPalletEvent<'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Nfts', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
-    ItemMetadataSet: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'ItemMetadataSet',
-      { collection: number; item: number; data: Bytes }
-    >;
+    ItemMetadataSet: GenericPalletEvent<'Nfts', 'ItemMetadataSet', { collection: number; item: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    ItemMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
+    ItemMetadataCleared: GenericPalletEvent<'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
 
     /**
      * The deposit for a set of `item`s within a `collection` has been updated.
      **/
-    Redeposited: GenericPalletEvent<Rv, 'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
+    Redeposited: GenericPalletEvent<'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeSet',
       {
@@ -2217,7 +2079,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes; namespace: PalletNftsAttributeNamespace }
@@ -2227,7 +2088,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was added.
      **/
     ItemAttributesApprovalAdded: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalAdded',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2237,7 +2097,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was removed.
      **/
     ItemAttributesApprovalRemoved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalRemoved',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2247,7 +2106,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2257,7 +2115,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2266,18 +2123,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Mint settings for a collection had changed.
      **/
-    CollectionMintSettingsUpdated: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'CollectionMintSettingsUpdated',
-      { collection: number }
-    >;
+    CollectionMintSettingsUpdated: GenericPalletEvent<'Nfts', 'CollectionMintSettingsUpdated', { collection: number }>;
 
     /**
      * Event gets emitted when the `NextCollectionId` gets incremented.
      **/
     NextCollectionIdIncremented: GenericPalletEvent<
-      Rv,
       'Nfts',
       'NextCollectionIdIncremented',
       { nextId?: number | undefined }
@@ -2287,7 +2138,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the item.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2296,13 +2146,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the item was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2312,7 +2161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A tip was sent.
      **/
     TipSent: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TipSent',
       { collection: number; item: number; sender: AccountId32; receiver: AccountId32; amount: bigint }
@@ -2322,7 +2170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An `item` swap intent was created.
      **/
     SwapCreated: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCreated',
       {
@@ -2339,7 +2186,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap was cancelled.
      **/
     SwapCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCancelled',
       {
@@ -2356,7 +2202,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap has been claimed.
      **/
     SwapClaimed: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapClaimed',
       {
@@ -2375,7 +2220,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New attributes have been set for an `item` of the `collection`.
      **/
     PreSignedAttributesSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PreSignedAttributesSet',
       { collection: number; item: number; namespace: PalletNftsAttributeNamespace }
@@ -2386,7 +2230,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * within that `collection`.
      **/
     PalletAttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PalletAttributeSet',
       { collection: number; item?: number | undefined; attribute: PalletNftsPalletAttributes; value: Bytes }
@@ -2395,7 +2238,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ForeignAssets`'s events
@@ -2405,7 +2248,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some asset class was created.
      **/
     Created: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Created',
       { assetId: StagingXcmV5Location; creator: AccountId32; owner: AccountId32 }
@@ -2415,7 +2257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were issued.
      **/
     Issued: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Issued',
       { assetId: StagingXcmV5Location; owner: AccountId32; amount: bigint }
@@ -2425,7 +2266,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Transferred',
       { assetId: StagingXcmV5Location; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2435,7 +2275,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were destroyed.
      **/
     Burned: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Burned',
       { assetId: StagingXcmV5Location; owner: AccountId32; balance: bigint }
@@ -2445,7 +2284,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TeamChanged',
       { assetId: StagingXcmV5Location; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2455,7 +2293,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The owner changed.
      **/
     OwnerChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'OwnerChanged',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2464,28 +2301,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
+    AssetFrozen: GenericPalletEvent<'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
+    AssetThawed: GenericPalletEvent<'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AccountsDestroyed',
       { assetId: StagingXcmV5Location; accountsDestroyed: number; accountsRemaining: number }
@@ -2495,7 +2331,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalsDestroyed',
       { assetId: StagingXcmV5Location; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2504,23 +2339,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'DestructionStarted',
-      { assetId: StagingXcmV5Location }
-    >;
+    DestructionStarted: GenericPalletEvent<'ForeignAssets', 'DestructionStarted', { assetId: StagingXcmV5Location }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
+    Destroyed: GenericPalletEvent<'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset class was force-created.
      **/
     ForceCreated: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ForceCreated',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2530,7 +2359,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'MetadataSet',
       { assetId: StagingXcmV5Location; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2539,13 +2367,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
+    MetadataCleared: GenericPalletEvent<'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovedTransfer',
       { assetId: StagingXcmV5Location; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2555,7 +2382,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalCancelled',
       { assetId: StagingXcmV5Location; owner: AccountId32; delegate: AccountId32 }
@@ -2566,7 +2392,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TransferredApproved',
       {
@@ -2581,18 +2406,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'AssetStatusChanged',
-      { assetId: StagingXcmV5Location }
-    >;
+    AssetStatusChanged: GenericPalletEvent<'ForeignAssets', 'AssetStatusChanged', { assetId: StagingXcmV5Location }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AssetMinBalanceChanged',
       { assetId: StagingXcmV5Location; newMinBalance: bigint }
@@ -2602,7 +2421,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some account `who` was created with a deposit from `depositor`.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Touched',
       { assetId: StagingXcmV5Location; who: AccountId32; depositor: AccountId32 }
@@ -2611,13 +2429,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Deposited',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2627,7 +2444,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Withdrawn',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2636,7 +2452,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssets`'s events
@@ -2645,23 +2461,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Created',
-      { assetId: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'PoolAssets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2670,13 +2480,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2685,33 +2494,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'PoolAssets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'PoolAssets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'PoolAssets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'PoolAssets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2721,7 +2529,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2730,23 +2537,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'PoolAssets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'PoolAssets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'PoolAssets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'PoolAssets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2755,13 +2561,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'PoolAssets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'PoolAssets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2771,7 +2576,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2782,7 +2586,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2791,13 +2594,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2806,32 +2608,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Touched',
-      { assetId: number; who: AccountId32; depositor: AccountId32 }
-    >;
+    Touched: GenericPalletEvent<'PoolAssets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversion`'s events
@@ -2841,7 +2638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `CreatePool` extrinsic will create this event.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'PoolCreated',
       {
@@ -2873,7 +2669,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `AddLiquidity` extrinsic will create this event.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityAdded',
       {
@@ -2918,7 +2713,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `RemoveLiquidity` extrinsic will create this event.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityRemoved',
       {
@@ -2969,7 +2763,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and `SwapTokenForExactToken` will generate this event.
      **/
     SwapExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapExecuted',
       {
@@ -3005,7 +2798,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Assets have been converted from one to another.
      **/
     SwapCreditExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapCreditExecuted',
       {
@@ -3031,7 +2823,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool has been touched in order to fulfill operational requirements.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'Touched',
       {
@@ -3050,7 +2841,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -3059,38 +2850,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -3099,18 +2884,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -3126,28 +2905,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -3156,18 +2935,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -3177,7 +2955,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -3186,12 +2963,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -3201,7 +2978,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -3226,7 +3002,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -3251,7 +3026,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -3276,7 +3050,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -3296,7 +3069,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -3322,7 +3094,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -3333,7 +3104,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -3348,7 +3118,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -3368,7 +3137,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -3383,7 +3151,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -3403,7 +3170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -3423,7 +3189,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -3443,7 +3208,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -3463,7 +3227,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -3488,7 +3251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -3508,7 +3270,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -3527,16 +3288,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -3545,7 +3305,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -3554,28 +3314,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -3584,38 +3343,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -3624,7 +3382,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -3633,13 +3391,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -3649,7 +3406,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -3658,31 +3414,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3691,7 +3444,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -3702,7 +3455,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -3711,22 +3463,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -3735,13 +3487,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -3750,12 +3501,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -3771,7 +3517,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -3786,7 +3531,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -3795,13 +3539,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -3815,7 +3558,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -3826,7 +3568,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -3835,13 +3576,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -3851,7 +3591,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -3861,7 +3600,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -3871,7 +3609,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -3881,7 +3618,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -3891,7 +3627,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -3901,7 +3636,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -3911,7 +3645,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -3921,7 +3654,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -3930,19 +3662,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -3952,7 +3678,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -3962,7 +3687,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -3978,7 +3702,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -3987,17 +3711,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -4007,7 +3731,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4017,7 +3740,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4027,7 +3749,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4037,7 +3758,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4046,7 +3766,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingRcClient`'s events
@@ -4056,7 +3776,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A said session report was received.
      **/
     SessionReportReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'SessionReportReceived',
       {
@@ -4071,7 +3790,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new offence was reported.
      **/
     OffenceReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'OffenceReceived',
       { slashSession: number; offencesCount: number }
@@ -4081,12 +3799,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElection`'s events
@@ -4097,7 +3815,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * values.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'MultiBlockElection',
       'PhaseTransitioned',
       {
@@ -4116,22 +3833,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Target snapshot creation failed
      **/
-    UnexpectedTargetSnapshotFailed: GenericPalletEvent<
-      Rv,
-      'MultiBlockElection',
-      'UnexpectedTargetSnapshotFailed',
-      null
-    >;
+    UnexpectedTargetSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedTargetSnapshotFailed', null>;
 
     /**
      * Voter snapshot creation failed
      **/
-    UnexpectedVoterSnapshotFailed: GenericPalletEvent<Rv, 'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
+    UnexpectedVoterSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s events
@@ -4144,7 +3856,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was wrong, or the final checks of `finalize_verification` failed.
      **/
     VerificationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'VerificationFailed',
       [number, PalletElectionProviderMultiBlockVerifierFeasibilityError]
@@ -4154,13 +3865,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given page of a solution has been verified, with the given number of winners being
      * found in it.
      **/
-    Verified: GenericPalletEvent<Rv, 'MultiBlockElectionVerifier', 'Verified', [number, number]>;
+    Verified: GenericPalletEvent<'MultiBlockElectionVerifier', 'Verified', [number, number]>;
 
     /**
      * A solution with the given score has replaced our current best solution.
      **/
     Queued: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'Queued',
       [SpNposElectionsElectionScore, SpNposElectionsElectionScore | undefined]
@@ -4169,7 +3879,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s events
@@ -4179,7 +3889,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Upcoming submission has been registered for the given account, with the given score.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionSigned',
       'Registered',
       [number, AccountId32, SpNposElectionsElectionScore]
@@ -4188,37 +3897,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A page of solution solution with the given index has been stored for the given account.
      **/
-    Stored: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
+    Stored: GenericPalletEvent<'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
 
     /**
      * The given account has been rewarded with the given amount.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
+    Rewarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
 
     /**
      * The given account has been slashed with the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
+    Slashed: GenericPalletEvent<'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
 
     /**
      * The given solution, for the given round, was ejected.
      **/
-    Ejected: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
+    Ejected: GenericPalletEvent<'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
 
     /**
      * The given account has been discarded.
      **/
-    Discarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
+    Discarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
 
     /**
      * The given account has bailed.
      **/
-    Bailed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
+    Bailed: GenericPalletEvent<'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -4228,18 +3937,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingAsyncRewardDestination; amount: bigint }
@@ -4248,18 +3951,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -4267,40 +3965,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A subsequent event of `Withdrawn`, indicating that `stash` was fully removed from the
      * system.
      **/
-    StakerRemoved: GenericPalletEvent<Rv, 'Staking', 'StakerRemoved', { stash: AccountId32 }>;
+    StakerRemoved: GenericPalletEvent<'Staking', 'StakerRemoved', { stash: AccountId32 }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -4310,7 +4007,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingAsyncValidatorPrefs }
@@ -4319,29 +4015,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * A page from a multi-page election was fetched. A number of these are followed by
@@ -4355,7 +4046,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the overall election will continue.
      **/
     PagedElectionProceeded: GenericPalletEvent<
-      Rv,
       'Staking',
       'PagedElectionProceeded',
       { page: number; result: Result<number, number> }
@@ -4366,7 +4056,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * given era as been reported.
      **/
     OffenceReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceReported',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -4376,7 +4065,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An offence has been processed and the corresponding slash has been computed.
      **/
     SlashComputed: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashComputed',
       { offenceEra: number; slashEra: number; offender: AccountId32; page: number }
@@ -4385,7 +4073,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unapplied slash has been cancelled.
      **/
-    SlashCancelled: GenericPalletEvent<Rv, 'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
+    SlashCancelled: GenericPalletEvent<'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
 
     /**
      * Session change has been triggered.
@@ -4394,7 +4082,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * election is ongoing.
      **/
     SessionRotated: GenericPalletEvent<
-      Rv,
       'Staking',
       'SessionRotated',
       { startingSession: number; activeEra: number; plannedEra: number }
@@ -4404,13 +4091,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
 
     /**
      * An offence was reported that was too old to be processed, and thus was dropped.
      **/
     OffenceTooOld: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceTooOld',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -4419,12 +4105,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An old era with the given index was pruned.
      **/
-    EraPruned: GenericPalletEvent<Rv, 'Staking', 'EraPruned', { index: number }>;
+    EraPruned: GenericPalletEvent<'Staking', 'EraPruned', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Revive`'s events
@@ -4434,7 +4120,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Revive',
       'ContractEmitted',
       {
@@ -4460,12 +4145,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by deployer at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
+    Instantiated: GenericPalletEvent<'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -4475,7 +4160,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -4490,7 +4174,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -4509,13 +4192,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -4529,7 +4211,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhOps`'s events
@@ -4539,7 +4221,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some lease reserve could not be unreserved and needs manual cleanup.
      **/
     LeaseUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'LeaseUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4549,7 +4230,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some amount for a crowdloan reserve could not be unreserved and needs manual cleanup.
      **/
     CrowdloanUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'CrowdloanUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4560,7 +4240,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * representation.
      **/
     SovereignMigrated: GenericPalletEvent<
-      Rv,
       'AhOps',
       'SovereignMigrated',
       {
@@ -4589,7 +4268,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhMigrator`'s events
@@ -4599,7 +4278,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'StageTransition',
       {
@@ -4619,7 +4297,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We received a batch of messages that will be integrated into a pallet.
      **/
     BatchReceived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchReceived',
       { pallet: PalletAhMigratorPalletEventName; count: number }
@@ -4629,7 +4306,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We processed a batch of messages for this pallet.
      **/
     BatchProcessed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchProcessed',
       { pallet: PalletAhMigratorPalletEventName; countGood: number; countBad: number }
@@ -4643,7 +4319,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * easier to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -4652,13 +4328,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * Whether the DMP queue was prioritized for the next block.
      **/
     DmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePrioritySet',
       {
@@ -4685,7 +4360,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The DMP queue priority config was set.
      **/
     DmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePriorityConfigSet',
       {
@@ -4705,7 +4379,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were recorded.
      **/
     BalancesBeforeRecordSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordSet',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4715,7 +4388,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were consumed.
      **/
     BalancesBeforeRecordConsumed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordConsumed',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4724,13 +4396,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A referendum was cancelled because it could not be mapped.
      **/
-    ReferendumCanceled: GenericPalletEvent<Rv, 'AhMigrator', 'ReferendumCanceled', { id: number }>;
+    ReferendumCanceled: GenericPalletEvent<'AhMigrator', 'ReferendumCanceled', { id: number }>;
 
     /**
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'ManagerSet',
       {
@@ -4746,13 +4417,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     AccountTranslatedParachainSovereign: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereign',
       { from: AccountId32; to: AccountId32 }
     >;
     AccountTranslatedParachainSovereignDerived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereignDerived',
       { from: AccountId32; to: AccountId32; derivationIndex: number }
@@ -4762,7 +4431,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'XcmSent',
       {
@@ -4776,6 +4444,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/index.d.ts b/packages/chaintypes/src/paseo-asset-hub/index.d.ts
index 8e4d7181..f9ace898 100644
--- a/packages/chaintypes/src/paseo-asset-hub/index.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AssetHubPaseoRuntimeRuntimeCall,
@@ -14,6 +14,7 @@ import type {
   FrameSystemExtensionsCheckWeight,
   PalletAssetConversionTxPaymentChargeAssetTxPayment,
   FrameMetadataHashExtensionCheckMetadataHash,
+  StagingXcmV5Location,
 } from './types.js';
 import { ChainConsts } from './consts.js';
 import { ChainStorage } from './query.js';
@@ -41,26 +42,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletAssetConversionTxPaymentChargeAssetTxPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPaseoAssetHubApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: StagingXcmV5Location;
 }
 
 /**
  * @name: PaseoAssetHubApi
- * @specVersion: 1009003
+ * @specVersion: 2000001
  **/
-export interface PaseoAssetHubApi {
-  legacy: VersionedPaseoAssetHubApi<RpcLegacy>;
-  v2: VersionedPaseoAssetHubApi<RpcV2>;
+export interface PaseoAssetHubApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/json-rpc.d.ts b/packages/chaintypes/src/paseo-asset-hub/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/paseo-asset-hub/json-rpc.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/paseo-asset-hub/query.d.ts b/packages/chaintypes/src/paseo-asset-hub/query.d.ts
index 875e8b8f..6676ca67 100644
--- a/packages/chaintypes/src/paseo-asset-hub/query.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -145,7 +145,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -156,35 +156,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -192,7 +192,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -200,28 +200,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -234,14 +234,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -258,21 +258,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -280,21 +280,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -307,12 +307,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -328,7 +328,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -338,7 +338,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -352,7 +351,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -363,7 +362,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -372,14 +371,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -388,7 +387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -401,7 +400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -412,7 +411,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -424,7 +423,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -438,7 +437,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -452,7 +450,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -462,7 +460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -473,7 +471,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -484,7 +481,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -494,7 +491,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -503,7 +499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -513,7 +509,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -524,7 +519,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -533,21 +528,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -555,7 +550,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -563,7 +558,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -571,7 +566,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -580,12 +575,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -596,7 +591,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -606,12 +601,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -621,12 +616,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -640,7 +635,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -648,19 +643,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -671,7 +666,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -679,7 +674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -687,11 +682,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -702,12 +693,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -720,7 +711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPaseoRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: AssetHubPaseoRuntimeRuntimeParametersKey) => AssetHubPaseoRuntimeRuntimeParametersValue | undefined,
       AssetHubPaseoRuntimeRuntimeParametersKey
     >;
@@ -728,7 +718,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -741,7 +731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -752,12 +742,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -768,14 +758,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -806,7 +796,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -817,7 +807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -827,7 +817,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -836,7 +826,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>> =} callback
      **/
     holds: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>,
       AccountId32
     >;
@@ -848,7 +837,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -856,7 +844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -866,18 +854,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -889,11 +877,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -902,12 +886,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -918,13 +902,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -935,11 +919,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -948,7 +928,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -959,12 +938,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -975,12 +954,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -991,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -1002,7 +981,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -1010,7 +989,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -1019,7 +998,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -1028,12 +1007,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1044,14 +1023,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1059,7 +1038,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1067,7 +1046,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1078,7 +1057,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1086,11 +1065,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AssetHubPaseoRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => AssetHubPaseoRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AssetHubPaseoRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1099,7 +1074,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1107,7 +1081,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1118,7 +1092,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1127,12 +1101,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1147,7 +1121,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -1157,12 +1131,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1180,7 +1154,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1192,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1201,7 +1175,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1213,7 +1186,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1223,14 +1195,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1239,7 +1211,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1247,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1258,7 +1229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1266,7 +1237,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1277,7 +1248,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1285,7 +1256,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1294,7 +1265,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1306,7 +1276,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1319,7 +1288,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1331,14 +1299,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1347,7 +1315,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1359,7 +1326,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1369,7 +1335,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1382,7 +1348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1394,7 +1360,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1405,7 +1371,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1413,7 +1378,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s storage queries
@@ -1430,12 +1395,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
+    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1448,7 +1413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1458,7 +1422,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1467,7 +1431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1475,7 +1438,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s storage queries
@@ -1486,12 +1449,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SnowbridgeCoreOperatingModeBasicOperatingMode> =} callback
      **/
-    exportOperatingMode: GenericStorageQuery<Rv, () => SnowbridgeCoreOperatingModeBasicOperatingMode>;
+    exportOperatingMode: GenericStorageQuery<() => SnowbridgeCoreOperatingModeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1504,7 +1467,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1512,7 +1474,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1526,7 +1488,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Array<PalletProxyProxyDefinitionProxyType>, bigint]> =} callback
      **/
     proxies: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [Array<PalletProxyProxyDefinitionProxyType>, bigint],
       AccountId32
     >;
@@ -1537,16 +1498,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -1558,12 +1515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1575,7 +1532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1584,7 +1541,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1598,7 +1554,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1609,7 +1564,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1624,12 +1579,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1641,7 +1596,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1649,7 +1604,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1659,7 +1614,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1671,7 +1625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1679,7 +1633,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1687,7 +1641,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1696,7 +1650,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -1708,7 +1661,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -1720,7 +1672,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1731,12 +1682,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1748,7 +1699,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1756,7 +1707,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1766,7 +1717,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1778,11 +1728,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1792,7 +1738,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -1803,7 +1748,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1811,7 +1756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1820,7 +1765,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -1832,7 +1776,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -1846,7 +1789,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1857,7 +1799,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1865,7 +1807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1873,11 +1815,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -1885,7 +1823,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1893,16 +1831,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1915,7 +1849,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
     asset: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletAssetsAssetDetails | undefined,
       StagingXcmV5Location
     >;
@@ -1927,7 +1860,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -1941,7 +1873,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [StagingXcmV5Location, AccountId32, AccountId32]
     >;
@@ -1952,7 +1883,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {StagingXcmV5Location} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
+    metadata: GenericStorageQuery<(arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1967,12 +1898,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => StagingXcmV5Location | undefined>;
+    nextAssetId: GenericStorageQuery<() => StagingXcmV5Location | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -1984,7 +1915,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1993,7 +1924,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2007,7 +1937,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2018,7 +1947,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2033,12 +1962,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -2052,7 +1981,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, StagingXcmV5Location]) => PalletAssetConversionPoolInfo | undefined,
       [StagingXcmV5Location, StagingXcmV5Location]
     >;
@@ -2063,12 +1991,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2082,7 +2010,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2093,14 +2021,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2110,14 +2038,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -2125,19 +2053,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -2151,7 +2079,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -2164,12 +2091,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -2180,7 +2107,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -2189,7 +2116,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferendaReferendumInfoOriginCaller | undefined> =} callback
      **/
     referendumInfoFor: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletReferendaReferendumInfoOriginCaller | undefined,
       number
     >;
@@ -2203,7 +2129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -2211,7 +2137,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -2224,12 +2150,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -2240,12 +2166,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2256,7 +2182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2264,7 +2190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2272,19 +2198,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2296,7 +2222,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -2305,7 +2231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -2313,7 +2239,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -2322,7 +2248,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -2335,7 +2260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -2347,7 +2272,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -2355,12 +2280,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -2375,7 +2300,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -2383,7 +2307,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2397,7 +2321,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -2406,7 +2330,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -2415,12 +2339,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2435,14 +2359,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2455,7 +2379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2463,7 +2387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2471,7 +2395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2479,7 +2403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2488,7 +2412,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2499,7 +2423,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2509,7 +2432,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2517,14 +2440,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2533,14 +2456,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2549,14 +2472,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2564,21 +2487,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2589,14 +2512,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2604,16 +2527,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2627,14 +2546,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2644,7 +2563,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2652,7 +2571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2662,12 +2581,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2683,7 +2602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2693,7 +2611,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2701,23 +2619,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRcClient`'s storage queries
@@ -2728,7 +2642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncRcClientSessionReport | undefined> =} callback
      **/
-    incompleteSessionReport: GenericStorageQuery<Rv, () => PalletStakingAsyncRcClientSessionReport | undefined>;
+    incompleteSessionReport: GenericStorageQuery<() => PalletStakingAsyncRcClientSessionReport | undefined>;
 
     /**
      * The last session report's `end_index` that we have acted upon.
@@ -2742,7 +2656,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSessionReportEndingIndex: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSessionReportEndingIndex: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A validator set that is outgoing, and should be sent.
@@ -2752,15 +2666,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientValidatorSetReport, number] | undefined> =} callback
      **/
-    outgoingValidatorSet: GenericStorageQuery<
-      Rv,
-      () => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined
-    >;
+    outgoingValidatorSet: GenericStorageQuery<() => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElection`'s storage queries
@@ -2776,14 +2687,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiBlockPhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockPhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiBlockPhase>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -2791,7 +2702,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    desiredTargets: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Paginated voter snapshot. At most [`T::Pages`] keys will exist.
@@ -2800,7 +2711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint, Array<AccountId32>]> | undefined> =} callback
      **/
     pagedVoterSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<[AccountId32, bigint, Array<AccountId32>]> | undefined,
       [number, number]
     >;
@@ -2813,7 +2723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedVoterSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedVoterSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Paginated target snapshot.
@@ -2824,7 +2734,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
     pagedTargetSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<AccountId32> | undefined,
       [number, number]
     >;
@@ -2837,12 +2746,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedTargetSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedTargetSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s storage queries
@@ -2861,7 +2770,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionX: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2873,7 +2781,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionY: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2886,7 +2793,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsValidSolution> =} callback
      **/
     queuedValidVariant: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiBlockVerifierImplsValidSolution,
       number
     >;
@@ -2905,7 +2811,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined> =} callback
      **/
     queuedSolutionBackings: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number],
       ) => Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined,
@@ -2920,26 +2825,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    queuedSolutionScore: GenericStorageQuery<Rv, (arg: number) => SpNposElectionsElectionScore | undefined, number>;
+    queuedSolutionScore: GenericStorageQuery<(arg: number) => SpNposElectionsElectionScore | undefined, number>;
 
     /**
      * The minimum score that each solution must attain in order to be considered feasible.
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Storage item for [`Status`].
      *
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsStatus> =} callback
      **/
-    statusStorage: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockVerifierImplsStatus>;
+    statusStorage: GenericStorageQuery<() => PalletElectionProviderMultiBlockVerifierImplsStatus>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s storage queries
@@ -2958,14 +2863,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, SpNposElectionsElectionScore]>> =} callback
      **/
-    sortedScores: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
+    sortedScores: GenericStorageQuery<(arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
 
     /**
      * Triple map from (round, account, page) to a solution page.
@@ -2974,7 +2879,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined> =} callback
      **/
     submissionStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined,
       [number, AccountId32, number]
     >;
@@ -2989,7 +2893,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined> =} callback
      **/
     submissionMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined,
       [number, AccountId32]
     >;
@@ -2997,7 +2900,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -3008,7 +2911,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -3017,7 +2920,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -3027,28 +2930,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -3057,7 +2960,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -3069,7 +2972,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncLedgerStakingLedger | undefined> =} callback
      **/
     ledger: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingAsyncLedgerStakingLedger | undefined,
       AccountId32
     >;
@@ -3082,11 +2984,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined,
-      AccountId32
-    >;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -3096,14 +2994,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -3112,7 +3010,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -3138,18 +3036,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncNominations | undefined,
-      AccountId32
-    >;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -3162,14 +3056,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -3178,7 +3072,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current planned era index.
@@ -3188,7 +3082,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -3198,7 +3092,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingAsyncActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingAsyncActiveEraInfo | undefined>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -3208,7 +3102,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -3228,7 +3122,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3245,7 +3138,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncPalletBoundedExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => PalletStakingAsyncPalletBoundedExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -3261,7 +3153,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Exposure of validator at era with the preferences of validators.
@@ -3274,7 +3166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncValidatorPrefs,
       [number, AccountId32]
     >;
@@ -3287,7 +3178,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -3296,7 +3187,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingAsyncEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -3305,14 +3196,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingAsyncForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingAsyncForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingAsyncForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -3321,7 +3212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -3330,7 +3221,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -3338,7 +3229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * Stores reported offences in a queue until they are processed in subsequent blocks.
@@ -3356,7 +3247,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncSlashingOffenceRecord | undefined> =} callback
      **/
     offenceQueue: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncSlashingOffenceRecord | undefined,
       [number, AccountId32]
     >;
@@ -3376,7 +3266,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    offenceQueueEras: GenericStorageQuery<Rv, () => Array<number> | undefined>;
+    offenceQueueEras: GenericStorageQuery<() => Array<number> | undefined>;
 
     /**
      * Tracks the currently processed offence record from the `OffenceQueue`.
@@ -3395,7 +3285,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined> =} callback
      **/
     processingOffence: GenericStorageQuery<
-      Rv,
       () => [number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined
     >;
 
@@ -3406,7 +3295,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncUnappliedSlash | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, [AccountId32Like, Perbill, number]]) => PalletStakingAsyncUnappliedSlash | undefined,
       [number, [AccountId32, Perbill, number]]
     >;
@@ -3421,7 +3309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, Perbill]>> =} callback
      **/
-    cancelledSlashes: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, Perbill]>, number>;
+    cancelledSlashes: GenericStorageQuery<(arg: number) => Array<[AccountId32, Perbill]>, number>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -3431,7 +3319,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -3443,7 +3330,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Voter snapshot progress status.
@@ -3453,7 +3340,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncSnapshotStatus> =} callback
      **/
-    voterSnapshotStatus: GenericStorageQuery<Rv, () => PalletStakingAsyncSnapshotStatus>;
+    voterSnapshotStatus: GenericStorageQuery<() => PalletStakingAsyncSnapshotStatus>;
 
     /**
      * Keeps track of an ongoing multi-page election solution request.
@@ -3465,14 +3352,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextElectionPage: GenericStorageQuery<Rv, () => number | undefined>;
+    nextElectionPage: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A bounded list of the "electable" stashes that resulted from a successful election.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    electableStashes: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    electableStashes: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Tracks the current step of era pruning process for each era being lazily pruned.
@@ -3480,12 +3367,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncPalletPruningStep | undefined> =} callback
      **/
-    eraPruningState: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
+    eraPruningState: GenericStorageQuery<(arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -3497,7 +3384,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -3505,7 +3392,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveVmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
 
     /**
      * The data associated to a contract or externally owned account.
@@ -3513,7 +3400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageAccountInfo | undefined> =} callback
      **/
-    accountInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
+    accountInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -3521,7 +3408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -3532,7 +3419,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -3540,7 +3427,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -3553,12 +3440,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -3569,12 +3456,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhOps`'s storage queries
@@ -3600,7 +3487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcLeaseReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3623,7 +3509,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, bigint] | undefined> =} callback
      **/
     rcCrowdloanContribution: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => [AccountId32, bigint] | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3643,7 +3528,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcCrowdloanReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3651,7 +3535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhMigrator`'s storage queries
@@ -3665,18 +3549,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRcMigratorAccountsAccount | undefined> =} callback
      **/
-    rcAccounts: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined,
-      AccountId32
-    >;
+    rcAccounts: GenericStorageQuery<(arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined, AccountId32>;
 
     /**
      * The Asset Hub migration state.
      *
      * @param {Callback<PalletAhMigratorMigrationStage> =} callback
      **/
-    ahMigrationStage: GenericStorageQuery<Rv, () => PalletAhMigratorMigrationStage>;
+    ahMigrationStage: GenericStorageQuery<() => PalletAhMigratorMigrationStage>;
 
     /**
      * Helper storage item to store the total balance / total issuance of native token at the start
@@ -3685,7 +3565,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAhMigratorBalancesBefore> =} callback
      **/
-    ahBalancesBefore: GenericStorageQuery<Rv, () => PalletAhMigratorBalancesBefore>;
+    ahBalancesBefore: GenericStorageQuery<() => PalletAhMigratorBalancesBefore>;
 
     /**
      * The priority of the DMP queue during migration.
@@ -3697,7 +3577,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    dmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    dmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -3707,7 +3587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -3717,7 +3597,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -3727,11 +3607,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/runtime.d.ts b/packages/chaintypes/src/paseo-asset-hub/runtime.d.ts
index 8f412c27..dfc7c194 100644
--- a/packages/chaintypes/src/paseo-asset-hub/runtime.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -30,6 +30,8 @@ import type {
   SpRuntimeTransactionValidityValidTransaction,
   SpRuntimeTransactionValidityTransactionSource,
   SpCoreCryptoKeyTypeId,
+  FrameSupportViewFunctionsViewFunctionDispatchError,
+  FrameSupportViewFunctionsViewFunctionId,
   PalletTransactionPaymentRuntimeDispatchInfo,
   PalletTransactionPaymentFeeDetails,
   SpWeightsWeightV2Weight,
@@ -64,7 +66,7 @@ import type {
   PalletReviveEvmApiDebugRpcTypesTracerType,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -76,19 +78,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -99,12 +101,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -126,12 +128,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -142,7 +144,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -150,7 +152,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -158,12 +160,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -174,7 +176,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -185,7 +187,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -194,12 +196,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -215,7 +217,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -226,7 +227,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -235,7 +236,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -247,14 +247,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -277,7 +276,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -290,7 +288,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -302,12 +300,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -325,7 +323,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -336,14 +334,36 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
+   **/
+  runtimeViewFunction: {
+    /**
+     * Execute a view function query.
+     *
+     * @callname: RuntimeViewFunction_execute_view_function
+     * @param {FrameSupportViewFunctionsViewFunctionId} query_id
+     * @param {BytesLike} input
+     **/
+    executeViewFunction: GenericRuntimeApiMethod<
+      (
+        queryId: FrameSupportViewFunctionsViewFunctionId,
+        input: BytesLike,
+      ) => Promise<Result<Bytes, FrameSupportViewFunctionsViewFunctionDispatchError>>
+    >;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -355,12 +375,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -373,7 +393,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -384,7 +403,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -393,19 +411,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -419,7 +437,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -431,7 +448,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -441,7 +457,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -449,12 +465,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -471,7 +487,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -486,7 +501,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -503,7 +517,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -522,7 +535,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -532,7 +544,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -547,7 +559,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AssetHubPaseoRuntimeOriginCaller,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
@@ -563,7 +574,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -573,7 +583,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -586,14 +596,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -611,7 +620,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -630,7 +638,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -640,7 +647,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -653,7 +660,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -667,7 +673,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -677,7 +682,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: FungiblesApi - 0xde92b8a0426b9bf6
@@ -690,14 +695,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} account
      **/
     queryAccountBalances: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like) => Promise<Result<XcmVersionedAssets, AssetsCommonRuntimeApiFungiblesAccessError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -712,12 +716,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -738,7 +742,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -759,7 +763,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -769,12 +773,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetConversionApi - 0x8a8047a53a8277ec
@@ -793,7 +797,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceTokensForExactTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -815,7 +818,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceExactTokensForTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -832,14 +834,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {StagingXcmV5Location} asset2
      **/
     getReserves: GenericRuntimeApiMethod<
-      Rv,
       (asset1: StagingXcmV5Location, asset2: StagingXcmV5Location) => Promise<[bigint, bigint] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -850,12 +851,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -867,7 +868,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -876,7 +877,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -885,7 +886,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -893,7 +894,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -904,7 +905,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -919,7 +920,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -933,7 +934,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -941,7 +942,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -949,7 +950,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -957,12 +958,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -974,7 +975,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -983,7 +984,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -992,12 +993,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ReviveApi - 0x8c403e5c4a9fd442
@@ -1008,7 +1009,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_gas_limit
      **/
-    blockGasLimit: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    blockGasLimit: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the free balance of the given `[H160]` address, using EVM decimals.
@@ -1016,14 +1017,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_balance
      * @param {H160} address
      **/
-    balance: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<U256>>;
+    balance: GenericRuntimeApiMethod<(address: H160) => Promise<U256>>;
 
     /**
      * Returns the gas price.
      *
      * @callname: ReviveApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the nonce of the given `[H160]` address.
@@ -1031,7 +1032,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_nonce
      * @param {H160} address
      **/
-    nonce: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number>>;
+    nonce: GenericRuntimeApiMethod<(address: H160) => Promise<number>>;
 
     /**
      * Perform a call from a specified account to a given contract.
@@ -1047,7 +1048,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: H160,
@@ -1073,7 +1073,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -1094,7 +1093,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiRpcTypesGenGenericTransaction} tx
      **/
     ethTransact: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
       ) => Promise<Result<PalletRevivePrimitivesEthTransactInfo, PalletRevivePrimitivesEthTransactError>>
@@ -1111,7 +1109,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} storage_deposit_limit
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -1131,7 +1128,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32>} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: H160,
         key: FixedBytes<32>,
@@ -1150,7 +1146,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorageVarKey: GenericRuntimeApiMethod<
-      Rv,
       (address: H160, key: BytesLike) => Promise<Result<Bytes | undefined, PalletRevivePrimitivesContractAccessError>>
     >;
 
@@ -1167,7 +1162,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1188,7 +1182,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceTx: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         txIndex: number,
@@ -1206,7 +1199,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceCall: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1218,7 +1210,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_author
      **/
-    blockAuthor: GenericRuntimeApiMethod<Rv, () => Promise<H160 | undefined>>;
+    blockAuthor: GenericRuntimeApiMethod<() => Promise<H160 | undefined>>;
 
     /**
      * Get the H160 address associated to this account id
@@ -1226,14 +1218,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_address
      * @param {AccountId32Like} account_id
      **/
-    address: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<H160>>;
+    address: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<H160>>;
 
     /**
      * The address used to call the runtime's pallets dispatchables
      *
      * @callname: ReviveApi_runtime_pallets_address
      **/
-    runtimePalletsAddress: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    runtimePalletsAddress: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * The code at the specified address taking pre-compiles into account.
@@ -1241,11 +1233,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_code
      * @param {H160} address
      **/
-    code: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    code: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/tx.d.ts b/packages/chaintypes/src/paseo-asset-hub/tx.d.ts
index 1c434fbc..226327a9 100644
--- a/packages/chaintypes/src/paseo-asset-hub/tx.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -129,16 +127,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AssetHubPaseoRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AssetHubPaseoRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -151,16 +151,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -170,16 +169,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -189,16 +187,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -211,16 +208,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -230,16 +226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -249,16 +244,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -272,19 +266,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -294,16 +287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -312,16 +304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeTask} task
      **/
     doTask: GenericTxCall<
-      Rv,
       (task: AssetHubPaseoRuntimeRuntimeTask) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'DoTask';
             params: { task: AssetHubPaseoRuntimeRuntimeTask };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -334,16 +325,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -360,16 +350,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -387,23 +376,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -424,12 +412,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -439,7 +425,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -448,23 +435,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -494,23 +480,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -519,7 +504,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -534,16 +519,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -558,16 +542,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -580,16 +563,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -601,16 +583,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -622,23 +603,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -653,14 +633,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -672,7 +650,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -683,19 +662,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -709,7 +687,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -717,7 +694,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -730,7 +706,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -740,16 +717,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -762,14 +738,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -781,7 +755,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -795,7 +770,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -803,7 +777,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -816,7 +789,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -839,20 +813,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -875,20 +848,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -898,16 +870,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -917,23 +888,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -948,23 +918,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: AssetHubPaseoRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: AssetHubPaseoRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -980,16 +949,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1006,20 +974,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1031,15 +998,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1053,23 +1019,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -1088,19 +1053,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1113,20 +1077,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1142,19 +1105,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1179,19 +1141,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1204,19 +1165,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1233,16 +1193,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1255,19 +1214,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1282,19 +1240,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1311,26 +1268,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1349,15 +1305,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1377,16 +1332,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1409,19 +1363,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1446,20 +1399,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1490,19 +1442,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1518,26 +1469,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -1573,19 +1523,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1612,14 +1561,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1631,7 +1578,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1669,13 +1617,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1686,7 +1632,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1714,16 +1661,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1734,27 +1680,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -1778,16 +1723,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1801,16 +1745,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1826,16 +1769,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1847,15 +1789,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1868,15 +1809,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1889,16 +1829,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1911,16 +1850,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1936,16 +1874,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1962,26 +1899,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2002,19 +1938,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: AssetHubPaseoRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: AssetHubPaseoRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2034,22 +1969,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -2062,15 +1996,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2083,15 +2016,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2105,16 +2037,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2128,16 +2059,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2151,23 +2081,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -2179,19 +2108,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2223,14 +2151,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2242,7 +2168,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2286,14 +2213,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2305,7 +2230,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2323,19 +2249,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2351,19 +2276,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2377,16 +2301,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2399,16 +2322,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2423,16 +2345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2475,7 +2396,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2483,7 +2403,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2496,7 +2415,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2527,7 +2447,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2535,7 +2454,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2548,7 +2466,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2561,16 +2480,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2616,7 +2534,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2624,7 +2541,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2637,7 +2553,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2653,19 +2570,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2728,7 +2644,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -2738,7 +2653,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2753,7 +2667,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2774,19 +2689,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2797,16 +2711,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2816,22 +2729,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -2840,7 +2752,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s transaction calls
@@ -2853,26 +2765,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isCongested
      **/
     reportBridgeStatus: GenericTxCall<
-      Rv,
       (
         bridgeId: H256,
         isCongested: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ToKusamaXcmRouter';
           palletCall: {
             name: 'ReportBridgeStatus';
             params: { bridgeId: H256; isCongested: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -2885,19 +2796,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2922,14 +2832,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -2941,14 +2849,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s transaction calls
@@ -2960,16 +2869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SnowbridgeCoreOperatingModeBasicOperatingMode} mode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (mode: SnowbridgeCoreOperatingModeBasicOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'SetOperatingMode';
             params: { mode: SnowbridgeCoreOperatingModeBasicOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2987,13 +2895,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} feeAsset
      **/
     registerToken: GenericTxCall<
-      Rv,
       (
         assetId: XcmVersionedLocation,
         metadata: SnowbridgeCoreAssetMetadata,
         feeAsset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
@@ -3004,7 +2910,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAsset: StagingXcmV5Asset;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3016,26 +2923,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} asset
      **/
     addTip: GenericTxCall<
-      Rv,
       (
         messageId: SnowbridgeCoreRewardMessageId,
         asset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'AddTip';
             params: { messageId: SnowbridgeCoreRewardMessageId; asset: StagingXcmV5Asset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -3064,16 +2970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPaseoRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AssetHubPaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3096,19 +3001,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3130,16 +3034,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPaseoRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AssetHubPaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3155,19 +3058,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubPaseoRuntimeOriginCaller,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AssetHubPaseoRuntimeOriginCaller; call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3189,16 +3091,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPaseoRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AssetHubPaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3214,19 +3115,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubPaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AssetHubPaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3259,19 +3159,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: AssetHubPaseoRuntimeRuntimeCallLike,
         fallback: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: AssetHubPaseoRuntimeRuntimeCallLike; fallback: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3286,26 +3185,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubPaseoRuntimeOriginCaller,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: AssetHubPaseoRuntimeOriginCaller; call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3329,19 +3227,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3393,7 +3290,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3401,7 +3297,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AssetHubPaseoRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3414,7 +3309,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3457,7 +3353,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3465,7 +3360,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3478,7 +3372,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3511,14 +3406,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3530,7 +3423,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3554,27 +3448,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -3596,13 +3489,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubPaseoRuntimeProxyType | undefined,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3613,7 +3504,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3633,20 +3525,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubPaseoRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubPaseoRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3664,20 +3555,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubPaseoRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubPaseoRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3691,15 +3581,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3728,20 +3617,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AssetHubPaseoRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AssetHubPaseoRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3770,7 +3658,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AssetHubPaseoRuntimeProxyType,
@@ -3778,7 +3665,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3791,7 +3677,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3816,19 +3703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3848,19 +3734,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3880,19 +3765,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3915,14 +3799,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AssetHubPaseoRuntimeProxyType | undefined,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3934,7 +3816,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3950,22 +3833,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -3988,16 +3870,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4019,19 +3900,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4052,16 +3932,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4085,20 +3964,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4119,16 +3997,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4147,23 +4024,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -4195,20 +4071,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4239,21 +4114,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4274,16 +4148,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4304,16 +4177,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4334,16 +4206,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4362,16 +4233,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4394,20 +4264,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4433,20 +4302,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4475,20 +4343,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4517,20 +4384,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4561,21 +4427,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4597,19 +4462,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4629,19 +4493,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4659,16 +4522,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4686,16 +4548,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4715,19 +4576,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4751,21 +4611,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4793,21 +4652,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4827,16 +4685,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4863,7 +4720,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -4871,14 +4727,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4898,16 +4754,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4945,7 +4800,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -4956,7 +4810,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -4972,7 +4825,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5003,20 +4857,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5039,19 +4892,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5075,20 +4927,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5118,21 +4969,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5150,16 +5000,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5182,19 +5031,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5216,19 +5064,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5248,19 +5095,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5283,19 +5129,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5315,19 +5160,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5354,27 +5198,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -5402,19 +5245,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: number,
         admin: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: number; admin: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5442,20 +5284,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: number; owner: MultiAddressLike; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5480,19 +5321,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5514,20 +5354,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: number; item: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5553,20 +5392,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         checkOwner: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number; checkOwner: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5594,20 +5432,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5634,19 +5471,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5666,19 +5502,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5698,19 +5533,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5728,16 +5562,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5755,16 +5588,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5785,19 +5617,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5821,14 +5652,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5840,7 +5669,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5865,20 +5695,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5905,20 +5734,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         maybeCheckDelegate: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; maybeCheckDelegate: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5949,7 +5777,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
@@ -5959,7 +5786,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5974,7 +5800,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6003,21 +5830,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6042,20 +5868,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6084,21 +5909,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6121,19 +5945,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6160,20 +5983,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6194,16 +6016,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6222,16 +6043,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6252,19 +6072,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6287,14 +6106,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -6306,7 +6123,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6326,27 +6144,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nfts`'s transaction calls
@@ -6373,19 +6190,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     create: GenericTxCall<
-      Rv,
       (
         admin: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Create';
             params: { admin: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6410,19 +6226,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         owner: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCreate';
             params: { owner: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6449,19 +6264,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletNftsDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletNftsDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6489,14 +6303,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintWitness | undefined} witnessData
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         witnessData: PalletNftsMintWitness | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6508,7 +6320,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessData: PalletNftsMintWitness | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6533,21 +6346,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsItemConfig} itemConfig
      **/
     forceMint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         itemConfig: PalletNftsItemConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceMint';
             params: { collection: number; item: number; mintTo: MultiAddressLike; itemConfig: PalletNftsItemConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6568,19 +6380,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6605,20 +6416,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6645,19 +6455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6677,19 +6486,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     lockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6709,19 +6517,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     unlockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UnlockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6743,19 +6550,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsBitFlags} lockSettings
      **/
     lockCollection: GenericTxCall<
-      Rv,
       (
         collection: number,
         lockSettings: PalletNftsBitFlags,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockCollection';
             params: { collection: number; lockSettings: PalletNftsBitFlags };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6776,19 +6582,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6816,14 +6621,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike | undefined,
         admin: MultiAddressLike | undefined,
         freezer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6835,7 +6638,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6855,19 +6659,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     forceCollectionOwner: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionOwner';
             params: { collection: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6887,19 +6690,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCollectionConfig: GenericTxCall<
-      Rv,
       (
         collection: number,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionConfig';
             params: { collection: number; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6925,21 +6727,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeDeadline
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         maybeDeadline: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike; maybeDeadline: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6964,20 +6765,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7000,19 +6800,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearAllTransferApprovals: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearAllTransferApprovals';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7041,21 +6840,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} lockAttributes
      **/
     lockItemProperties: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         lockMetadata: boolean,
         lockAttributes: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemProperties';
             params: { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7090,7 +6888,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
@@ -7098,7 +6895,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7111,7 +6907,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7142,7 +6939,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     forceSetAttribute: GenericTxCall<
-      Rv,
       (
         setAs: AccountId32Like | undefined,
         collection: number,
@@ -7151,7 +6947,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7165,7 +6960,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7192,14 +6988,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         namespace: PalletNftsAttributeNamespace,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7211,7 +7005,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               key: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7231,20 +7026,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveItemAttributes: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveItemAttributes';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7266,14 +7060,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCancelAttributesApprovalWitness} witness
      **/
     cancelItemAttributesApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         witness: PalletNftsCancelAttributesApprovalWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7285,7 +7077,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletNftsCancelAttributesApprovalWitness;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7312,20 +7105,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7348,19 +7140,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7385,19 +7176,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7418,16 +7208,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7446,16 +7235,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7474,19 +7262,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7505,19 +7292,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintSettings} mintSettings
      **/
     updateMintSettings: GenericTxCall<
-      Rv,
       (
         collection: number,
         mintSettings: PalletNftsMintSettings,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UpdateMintSettings';
             params: { collection: number; mintSettings: PalletNftsMintSettings };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7540,14 +7326,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7559,7 +7343,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7579,20 +7364,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7608,16 +7392,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletNftsItemTip>} tips
      **/
     payTips: GenericTxCall<
-      Rv,
       (tips: Array<PalletNftsItemTip>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'PayTips';
             params: { tips: Array<PalletNftsItemTip> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7647,7 +7430,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     createSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
@@ -7656,7 +7438,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maybePrice: PalletNftsPriceWithDirection | undefined,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7670,7 +7451,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7689,19 +7471,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} offeredItem
      **/
     cancelSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelSwap';
             params: { offeredCollection: number; offeredItem: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7726,7 +7507,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsPriceWithDirection | undefined} witnessPrice
      **/
     claimSwap: GenericTxCall<
-      Rv,
       (
         sendCollection: number,
         sendItem: number,
@@ -7734,7 +7514,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         receiveItem: number,
         witnessPrice: PalletNftsPriceWithDirection | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7747,7 +7526,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessPrice: PalletNftsPriceWithDirection | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7771,20 +7551,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     mintPreSigned: GenericTxCall<
-      Rv,
       (
         mintData: PalletNftsPreSignedMint,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'MintPreSigned';
             params: { mintData: PalletNftsPreSignedMint; signature: SpRuntimeMultiSignature; signer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7808,13 +7587,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     setAttributesPreSigned: GenericTxCall<
-      Rv,
       (
         data: PalletNftsPreSignedAttributes,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7825,14 +7602,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signer: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ForeignAssets`'s transaction calls
@@ -7864,20 +7642,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Create';
             params: { id: StagingXcmV5Location; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7908,21 +7685,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7943,16 +7719,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7973,16 +7748,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8003,16 +7777,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8031,16 +7804,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8063,20 +7835,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Mint';
             params: { id: StagingXcmV5Location; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8102,20 +7873,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Burn';
             params: { id: StagingXcmV5Location; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8144,20 +7914,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8186,20 +7955,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8230,21 +7998,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: StagingXcmV5Location; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8266,19 +8033,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8298,19 +8064,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8328,16 +8093,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8355,16 +8119,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8384,19 +8147,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8420,14 +8182,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8439,7 +8199,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8467,21 +8228,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: StagingXcmV5Location; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8501,16 +8261,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8537,7 +8296,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
@@ -8545,7 +8303,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8558,7 +8315,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8578,16 +8336,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8625,7 +8382,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
@@ -8636,7 +8392,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8652,7 +8407,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8683,20 +8439,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8719,19 +8474,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8755,20 +8509,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8798,14 +8551,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8817,7 +8568,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8835,16 +8587,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Touch';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8867,19 +8618,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Refund';
             params: { id: StagingXcmV5Location; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8901,19 +8651,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: StagingXcmV5Location; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8933,19 +8682,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8968,19 +8716,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9000,19 +8747,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Block';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9039,27 +8785,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: StagingXcmV5Location; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PoolAssets`'s transaction calls
@@ -9091,20 +8836,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9135,21 +8879,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9170,16 +8913,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9200,16 +8942,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9230,16 +8971,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9258,16 +8998,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9290,20 +9029,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9329,20 +9067,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9371,20 +9108,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9413,20 +9149,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9457,21 +9192,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9493,19 +9227,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9525,19 +9258,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9555,16 +9287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9582,16 +9313,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9611,19 +9341,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9647,21 +9376,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9689,21 +9417,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9723,16 +9450,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9759,7 +9485,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -9767,14 +9492,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9794,16 +9519,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9841,7 +9565,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -9852,7 +9575,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
@@ -9868,7 +9590,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9899,20 +9622,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9935,19 +9657,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9971,20 +9692,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10014,21 +9734,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10046,16 +9765,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10078,19 +9796,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10112,19 +9829,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10144,19 +9860,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10179,19 +9894,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10211,19 +9925,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10250,27 +9963,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversion`'s transaction calls
@@ -10286,19 +9998,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'CreatePool';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10327,7 +10038,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} mintTo
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10337,7 +10047,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2Min: bigint,
         mintTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10352,7 +10061,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               mintTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10369,7 +10079,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} withdrawTo
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10378,7 +10087,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2MinReceive: bigint,
         withdrawTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10392,7 +10100,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               withdrawTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10411,7 +10120,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapExactTokensForTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountIn: bigint,
@@ -10419,7 +10127,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10432,7 +10139,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10451,7 +10159,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapTokensForExactTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountOut: bigint,
@@ -10459,7 +10166,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10472,7 +10178,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10493,26 +10200,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     touch: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'Touch';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -10541,19 +10247,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10583,16 +10288,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10630,14 +10334,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: ParachainsCommonPayVersionedLocatableAccount,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -10649,7 +10351,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10679,16 +10382,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10718,16 +10420,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10752,23 +10453,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -10789,19 +10489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10836,14 +10535,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -10855,7 +10552,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10878,16 +10576,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10906,19 +10603,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10957,19 +10653,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10996,27 +10691,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -11038,13 +10732,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: AssetHubPaseoRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -11055,7 +10747,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11072,16 +10765,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11097,16 +10789,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11121,16 +10812,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11145,16 +10835,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11167,16 +10856,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11194,16 +10882,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11219,16 +10906,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11245,26 +10931,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -11275,16 +10960,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11293,16 +10977,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11313,20 +10996,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11335,23 +11017,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -11375,19 +11056,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11403,16 +11083,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11429,20 +11108,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11468,16 +11146,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11493,16 +11170,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11522,19 +11198,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11551,16 +11226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11578,16 +11252,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11606,19 +11279,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11640,20 +11312,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11677,23 +11348,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -11725,20 +11395,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11765,21 +11434,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11808,19 +11476,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11864,19 +11531,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11904,20 +11570,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11943,19 +11608,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11987,26 +11651,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -12022,19 +11685,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12048,19 +11710,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12073,23 +11734,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -12103,16 +11763,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12144,13 +11803,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -12161,7 +11818,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12175,19 +11833,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12204,20 +11861,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12227,16 +11883,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12255,26 +11910,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -12302,19 +11956,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12330,16 +11983,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12355,15 +12007,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12404,19 +12055,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12432,19 +12082,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12476,19 +12125,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12517,21 +12165,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12550,7 +12197,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -12558,7 +12204,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12571,7 +12216,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12593,19 +12239,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12625,19 +12270,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12651,19 +12295,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12688,7 +12331,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -12697,7 +12339,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12711,7 +12352,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12730,14 +12372,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12749,7 +12389,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12775,16 +12416,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12803,19 +12443,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12831,16 +12470,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12853,16 +12491,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12877,19 +12514,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12904,19 +12540,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12930,19 +12565,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12967,16 +12601,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12992,16 +12625,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13015,19 +12647,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13045,16 +12676,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13072,16 +12702,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13099,23 +12728,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -13136,16 +12764,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13164,16 +12791,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13186,26 +12812,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingRcClient`'s transaction calls
@@ -13217,16 +12842,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientSessionReport} report
      **/
     relaySessionReport: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientSessionReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelaySessionReport';
             params: { report: PalletStakingAsyncRcClientSessionReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13235,23 +12859,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletStakingAsyncRcClientOffence]>} offences
      **/
     relayNewOffencePaged: GenericTxCall<
-      Rv,
       (offences: Array<[number, PalletStakingAsyncRcClientOffence]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelayNewOffencePaged';
             params: { offences: Array<[number, PalletStakingAsyncRcClientOffence]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElection`'s transaction calls
@@ -13267,23 +12890,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockAdminOperation} op
      **/
     manage: GenericTxCall<
-      Rv,
       (op: PalletElectionProviderMultiBlockAdminOperation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElection';
           palletCall: {
             name: 'Manage';
             params: { op: PalletElectionProviderMultiBlockAdminOperation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s transaction calls
@@ -13292,7 +12914,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionUnsigned`'s transaction calls
@@ -13318,23 +12940,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockPagedRawSolution} pagedSolution
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionUnsigned';
           palletCall: {
             name: 'SubmitUnsigned';
             params: { pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s transaction calls
@@ -13346,16 +12967,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore} claimedScore
      **/
     register: GenericTxCall<
-      Rv,
       (claimedScore: SpNposElectionsElectionScore) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Register';
             params: { claimedScore: SpNposElectionsElectionScore };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13373,19 +12993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined} maybeSolution
      **/
     submitPage: GenericTxCall<
-      Rv,
       (
         page: number,
         maybeSolution: AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SubmitPage';
             params: { page: number; maybeSolution: AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13398,15 +13017,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bail: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Bail';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13422,19 +13040,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessPages
      **/
     clearOldRoundData: GenericTxCall<
-      Rv,
       (
         round: number,
         witnessPages: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'ClearOldRoundData';
             params: { round: number; witnessPages: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13446,23 +13063,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} inv
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (inv: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SetInvulnerables';
             params: { inv: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -13486,19 +13102,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingAsyncRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13517,16 +13132,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13554,16 +13168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13591,16 +13204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13614,16 +13226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingAsyncValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingAsyncValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13637,16 +13248,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13664,15 +13274,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13686,16 +13295,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingAsyncRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13711,15 +13319,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13731,16 +13338,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13753,16 +13359,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13775,16 +13380,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13801,15 +13405,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13827,15 +13430,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13847,16 +13449,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13874,19 +13475,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13903,15 +13503,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13932,19 +13531,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Perbill]>} validatorSlashes
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         validatorSlashes: Array<[AccountId32Like, Perbill]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; validatorSlashes: Array<[AccountId32Like, Perbill]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13967,19 +13565,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13991,16 +13588,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14028,19 +13624,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14060,16 +13655,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14101,7 +13695,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingAsyncPalletConfigOp,
         minValidatorBond: PalletStakingAsyncPalletConfigOp,
@@ -14111,7 +13704,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingAsyncPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14126,7 +13718,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14161,16 +13754,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14182,16 +13774,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14204,16 +13795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14241,20 +13831,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14269,16 +13858,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14294,16 +13882,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14326,14 +13913,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingAsyncLedgerUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14345,7 +13930,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14361,16 +13947,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14413,19 +13998,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[AccountId32Like, Perbill, number]} slashKey
      **/
     applySlash: GenericTxCall<
-      Rv,
       (
         slashEra: number,
         slashKey: [AccountId32Like, Perbill, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ApplySlash';
             params: { slashEra: number; slashKey: [AccountId32Like, Perbill, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14445,23 +14029,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     pruneEraStep: GenericTxCall<
-      Rv,
       (era: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PruneEraStep';
             params: { era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Revive`'s transaction calls
@@ -14487,16 +14070,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} payload
      **/
     ethTransact: GenericTxCall<
-      Rv,
       (payload: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'EthTransact';
             params: { payload: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14525,7 +14107,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: bigint,
@@ -14533,7 +14114,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -14546,7 +14126,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14565,7 +14146,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -14574,7 +14154,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -14588,7 +14167,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14629,7 +14209,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -14638,7 +14217,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -14652,7 +14230,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14672,7 +14251,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     ethInstantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: U256,
         gasLimit: SpWeightsWeightV2Weight,
@@ -14680,7 +14258,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         code: BytesLike,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -14693,7 +14270,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14708,7 +14286,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     ethCall: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: U256,
@@ -14716,7 +14293,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -14729,7 +14305,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14751,19 +14328,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} storageDepositLimit
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UploadCode';
             params: { code: BytesLike; storageDepositLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14776,16 +14352,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14805,19 +14380,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: H160,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'SetCode';
             params: { dest: H160; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14829,15 +14403,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     mapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'MapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14849,15 +14422,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unmapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UnmapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14871,23 +14443,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallbackAccount: GenericTxCall<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'DispatchAsFallbackAccount';
             params: { call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -14899,16 +14470,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14923,19 +14493,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubPaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: AssetHubPaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14946,16 +14515,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14969,19 +14537,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPaseoRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: AssetHubPaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: AssetHubPaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14992,22 +14559,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhOps`'s transaction calls
@@ -15028,13 +14594,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveLeaseDeposit: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -15045,7 +14609,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15063,13 +14628,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     withdrawCrowdloanContribution: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -15080,7 +14643,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15099,13 +14663,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveCrowdloanReserve: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -15116,7 +14678,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15129,23 +14692,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} assetId
      **/
     transferToPostMigrationTreasury: GenericTxCall<
-      Rv,
       (assetId: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'TransferToPostMigrationTreasury';
             params: { assetId: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhMigrator`'s transaction calls
@@ -15159,16 +14721,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorAccountsAccount>} accounts
      **/
     receiveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorAccountsAccount>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAccounts';
             params: { accounts: Array<PalletRcMigratorAccountsAccount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15182,16 +14743,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorMultisigRcMultisig>} accounts
      **/
     receiveMultisigs: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorMultisigRcMultisig>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveMultisigs';
             params: { accounts: Array<PalletRcMigratorMultisigRcMultisig> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15201,16 +14761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxy>} proxies
      **/
     receiveProxyProxies: GenericTxCall<
-      Rv,
       (proxies: Array<PalletRcMigratorProxyRcProxy>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyProxies';
             params: { proxies: Array<PalletRcMigratorProxyRcProxy> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15220,16 +14779,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxyAnnouncement>} announcements
      **/
     receiveProxyAnnouncements: GenericTxCall<
-      Rv,
       (announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyAnnouncements';
             params: { announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15238,16 +14796,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageChunksRcPreimageChunk>} chunks
      **/
     receivePreimageChunks: GenericTxCall<
-      Rv,
       (chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageChunks';
             params: { chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15256,16 +14813,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>} requestStatus
      **/
     receivePreimageRequestStatus: GenericTxCall<
-      Rv,
       (requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageRequestStatus';
             params: { requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15274,18 +14830,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>} legacyStatus
      **/
     receivePreimageLegacyStatus: GenericTxCall<
-      Rv,
       (
         legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageLegacyStatus';
             params: { legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15294,16 +14849,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>} messages
      **/
     receiveNomPoolsMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveNomPoolsMessages';
             params: { messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15312,16 +14866,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorVestingRcVestingSchedule>} schedules
      **/
     receiveVestingSchedules: GenericTxCall<
-      Rv,
       (schedules: Array<PalletRcMigratorVestingRcVestingSchedule>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveVestingSchedules';
             params: { schedules: Array<PalletRcMigratorVestingRcVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15331,16 +14884,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorReferendaReferendaMessage>} values
      **/
     receiveReferendaValues: GenericTxCall<
-      Rv,
       (values: Array<PalletRcMigratorReferendaReferendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaValues';
             params: { values: Array<PalletRcMigratorReferendaReferendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15350,16 +14902,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletReferendaReferendumInfo]>} referendums
      **/
     receiveReferendums: GenericTxCall<
-      Rv,
       (referendums: Array<[number, PalletReferendaReferendumInfo]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendums';
             params: { referendums: Array<[number, PalletReferendaReferendumInfo]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15368,16 +14919,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorClaimsRcClaimsMessage>} messages
      **/
     receiveClaims: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorClaimsRcClaimsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveClaims';
             params: { messages: Array<PalletRcMigratorClaimsRcClaimsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15386,16 +14936,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>} messages
      **/
     receiveBagsListMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBagsListMessages';
             params: { messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15404,16 +14953,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerRcSchedulerMessage>} messages
      **/
     receiveSchedulerMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerMessages';
             params: { messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15422,16 +14970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorIndicesRcIndicesIndex>} indices
      **/
     receiveIndices: GenericTxCall<
-      Rv,
       (indices: Array<PalletRcMigratorIndicesRcIndicesIndex>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveIndices';
             params: { indices: Array<PalletRcMigratorIndicesRcIndicesIndex> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15440,16 +14987,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>} messages
      **/
     receiveConvictionVotingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveConvictionVotingMessages';
             params: { messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15458,16 +15004,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorBountiesRcBountiesMessage>} messages
      **/
     receiveBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorBountiesRcBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBountiesMessages';
             params: { messages: Array<PalletRcMigratorBountiesRcBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15476,16 +15021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>} rates
      **/
     receiveAssetRates: GenericTxCall<
-      Rv,
       (rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAssetRates';
             params: { rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15494,16 +15038,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>} messages
      **/
     receiveCrowdloanMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveCrowdloanMessages';
             params: { messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15512,16 +15055,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, H256]>} metadata
      **/
     receiveReferendaMetadata: GenericTxCall<
-      Rv,
       (metadata: Array<[number, H256]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaMetadata';
             params: { metadata: Array<[number, H256]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15530,16 +15072,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorTreasuryPortableTreasuryMessage>} messages
      **/
     receiveTreasuryMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveTreasuryMessages';
             params: { messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15548,16 +15089,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>} messages
      **/
     receiveSchedulerAgendaMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerAgendaMessages';
             params: { messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15566,18 +15106,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>} messages
      **/
     receiveDelegatedStakingMessages: GenericTxCall<
-      Rv,
       (
         messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveDelegatedStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15586,16 +15125,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>} messages
      **/
     receiveChildBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveChildBountiesMessages';
             params: { messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15604,16 +15142,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingMessagePortableStakingMessage>} messages
      **/
     receiveStakingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15626,16 +15163,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAhMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletAhMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletAhMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15647,15 +15183,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'StartMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15667,16 +15202,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setDmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetDmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15689,16 +15223,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15714,16 +15247,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorMigrationFinishedData | undefined} data
      **/
     finishMigration: GenericTxCall<
-      Rv,
       (data: PalletRcMigratorMigrationFinishedData | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'FinishMigration';
             params: { data: PalletRcMigratorMigrationFinishedData | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15736,25 +15268,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/paseo-asset-hub/types.d.ts b/packages/chaintypes/src/paseo-asset-hub/types.d.ts
index d7bf77bf..54a44089 100644
--- a/packages/chaintypes/src/paseo-asset-hub/types.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/types.d.ts
@@ -22057,6 +22057,13 @@ export type SpRuntimeTransactionValidityValidTransaction = {
   propagate: boolean;
 };
 
+export type FrameSupportViewFunctionsViewFunctionId = { prefix: FixedBytes<16>; suffix: FixedBytes<16> };
+
+export type FrameSupportViewFunctionsViewFunctionDispatchError =
+  | { type: 'NotImplemented' }
+  | { type: 'NotFound'; value: FrameSupportViewFunctionsViewFunctionId }
+  | { type: 'Codec' };
+
 export type PalletTransactionPaymentRuntimeDispatchInfo = {
   weight: SpWeightsWeightV2Weight;
   class: FrameSupportDispatchDispatchClass;
diff --git a/packages/chaintypes/src/paseo-asset-hub/view-functions.d.ts b/packages/chaintypes/src/paseo-asset-hub/view-functions.d.ts
index cdc4f001..baec8084 100644
--- a/packages/chaintypes/src/paseo-asset-hub/view-functions.d.ts
+++ b/packages/chaintypes/src/paseo-asset-hub/view-functions.d.ts
@@ -1,10 +1,10 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type { AssetHubPaseoRuntimeRuntimeCallLike, AssetHubPaseoRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -16,7 +16,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubPaseoRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: AssetHubPaseoRuntimeRuntimeCallLike, proxyType: AssetHubPaseoRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -27,14 +26,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubPaseoRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: AssetHubPaseoRuntimeProxyType, against: AssetHubPaseoRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -51,12 +49,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s view functions
@@ -72,11 +70,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AccountId32Like} who
      * @param {number} pages
      **/
-    depositFor: GenericViewFunction<Rv, (who: AccountId32Like, pages: number) => Promise<bigint>>;
+    depositFor: GenericViewFunction<(who: AccountId32Like, pages: number) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/consts.d.ts b/packages/chaintypes/src/paseo-hydration/consts.d.ts
index 5fd42387..ab57257a 100644
--- a/packages/chaintypes/src/paseo-hydration/consts.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, AccountId32, FixedBytes, Perbill, FixedU128, H160, Percent } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -16,7 +16,7 @@ import type {
   StagingXcmV4Location,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
@@ -768,7 +768,6 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
    **/
   duster: {
     /**
-     * Duster for accounts with AToken dusts
      * Treasury account, which receives the dust.
      **/
     treasuryAccountId: AccountId32;
@@ -1773,6 +1772,17 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
      **/
     [name: string]: any;
   };
+  /**
+   * Pallet `IsmpOracle`'s constants
+   **/
+  ismpOracle: {
+    requestsTimeout: bigint;
+
+    /**
+     * Generic pallet constant
+     **/
+    [name: string]: any;
+  };
   /**
    * Pallet `EmaOracle`'s constants
    **/
diff --git a/packages/chaintypes/src/paseo-hydration/errors.d.ts b/packages/chaintypes/src/paseo-hydration/errors.d.ts
index 42dc8868..8174e1cb 100644
--- a/packages/chaintypes/src/paseo-hydration/errors.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -68,67 +68,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiTransactionPayment`'s errors
@@ -137,67 +137,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Selected currency is not supported.
      **/
-    UnsupportedCurrency: GenericPalletError<Rv>;
+    UnsupportedCurrency: GenericPalletError;
 
     /**
      * Account balance should be non-zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Currency is already in the list of accepted currencies.
      **/
-    AlreadyAccepted: GenericPalletError<Rv>;
+    AlreadyAccepted: GenericPalletError;
 
     /**
      * It is not allowed to add Core Asset as accepted currency. Core asset is accepted by design.
      **/
-    CoreAssetNotAllowed: GenericPalletError<Rv>;
+    CoreAssetNotAllowed: GenericPalletError;
 
     /**
      * Fallback price cannot be zero.
      **/
-    ZeroPrice: GenericPalletError<Rv>;
+    ZeroPrice: GenericPalletError;
 
     /**
      * Fallback price was not found.
      **/
-    FallbackPriceNotFound: GenericPalletError<Rv>;
+    FallbackPriceNotFound: GenericPalletError;
 
     /**
      * Math overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * It is not allowed to change payment currency of an EVM account.
      **/
-    EvmAccountNotAllowed: GenericPalletError<Rv>;
+    EvmAccountNotAllowed: GenericPalletError;
 
     /**
      * EVM permit expired.
      **/
-    EvmPermitExpired: GenericPalletError<Rv>;
+    EvmPermitExpired: GenericPalletError;
 
     /**
      * EVM permit is invalid.
      **/
-    EvmPermitInvalid: GenericPalletError<Rv>;
+    EvmPermitInvalid: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitCallExecutionError: GenericPalletError<Rv>;
+    EvmPermitCallExecutionError: GenericPalletError;
 
     /**
      * EVM permit call failed.
      **/
-    EvmPermitRunnerError: GenericPalletError<Rv>;
+    EvmPermitRunnerError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -206,63 +206,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -271,12 +271,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -285,47 +285,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -334,137 +334,137 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Democracy`'s errors
@@ -473,128 +473,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Value too low
      **/
-    ValueLow: GenericPalletError<Rv>;
+    ValueLow: GenericPalletError;
 
     /**
      * Proposal does not exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Cannot cancel the same proposal twice
      **/
-    AlreadyCanceled: GenericPalletError<Rv>;
+    AlreadyCanceled: GenericPalletError;
 
     /**
      * Proposal already made
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal still blacklisted
      **/
-    ProposalBlacklisted: GenericPalletError<Rv>;
+    ProposalBlacklisted: GenericPalletError;
 
     /**
      * Next external proposal not simple majority
      **/
-    NotSimpleMajority: GenericPalletError<Rv>;
+    NotSimpleMajority: GenericPalletError;
 
     /**
      * Invalid hash
      **/
-    InvalidHash: GenericPalletError<Rv>;
+    InvalidHash: GenericPalletError;
 
     /**
      * No external proposal
      **/
-    NoProposal: GenericPalletError<Rv>;
+    NoProposal: GenericPalletError;
 
     /**
      * Identity may not veto a proposal twice
      **/
-    AlreadyVetoed: GenericPalletError<Rv>;
+    AlreadyVetoed: GenericPalletError;
 
     /**
      * Vote given for invalid referendum
      **/
-    ReferendumInvalid: GenericPalletError<Rv>;
+    ReferendumInvalid: GenericPalletError;
 
     /**
      * No proposals waiting
      **/
-    NoneWaiting: GenericPalletError<Rv>;
+    NoneWaiting: GenericPalletError;
 
     /**
      * The given account did not vote on the referendum.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed, either through `unvote` or `reap_vote`.
      **/
-    VotesExist: GenericPalletError<Rv>;
+    VotesExist: GenericPalletError;
 
     /**
      * The instant referendum origin is currently disallowed.
      **/
-    InstantNotAllowed: GenericPalletError<Rv>;
+    InstantNotAllowed: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Invalid upper bound.
      **/
-    WrongUpperBound: GenericPalletError<Rv>;
+    WrongUpperBound: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Maximum number of items reached.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Voting period too low
      **/
-    VotingPeriodLow: GenericPalletError<Rv>;
+    VotingPeriodLow: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommittee`'s errors
@@ -603,62 +603,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -667,47 +667,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -716,77 +716,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -795,97 +795,97 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -894,7 +894,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -905,32 +905,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -939,68 +939,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1009,77 +1009,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -1088,32 +1088,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Dispatcher`'s errors
@@ -1123,17 +1123,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The EVM call execution failed. This happens when the EVM returns an exit reason
      * other than `ExitSucceed(Returned)` or `ExitSucceed(Stopped)`.
      **/
-    EvmCallFailed: GenericPalletError<Rv>;
+    EvmCallFailed: GenericPalletError;
 
     /**
      * The provided call is not an EVM call. This extrinsic only accepts `pallet_evm::Call::call`.
      **/
-    NotEvmCall: GenericPalletError<Rv>;
+    NotEvmCall: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRegistry`'s errors
@@ -1142,82 +1142,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID is not available. This only happens when it reaches the MAX value of given id type.
      **/
-    NoIdAvailable: GenericPalletError<Rv>;
+    NoIdAvailable: GenericPalletError;
 
     /**
      * Invalid asset name or symbol.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Length of name or symbol is less than min. length.
      **/
-    TooShort: GenericPalletError<Rv>;
+    TooShort: GenericPalletError;
 
     /**
      * Asset's symbol can't contain whitespace characters .
      **/
-    InvalidSymbol: GenericPalletError<Rv>;
+    InvalidSymbol: GenericPalletError;
 
     /**
      * Asset ID is not registered in the asset-registry.
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Asset is already registered.
      **/
-    AssetAlreadyRegistered: GenericPalletError<Rv>;
+    AssetAlreadyRegistered: GenericPalletError;
 
     /**
      * Incorrect number of assets provided to create shared asset.
      **/
-    InvalidSharedAssetLen: GenericPalletError<Rv>;
+    InvalidSharedAssetLen: GenericPalletError;
 
     /**
      * Cannot update asset location.
      **/
-    CannotUpdateLocation: GenericPalletError<Rv>;
+    CannotUpdateLocation: GenericPalletError;
 
     /**
      * Selected asset id is out of reserved range.
      **/
-    NotInReservedRange: GenericPalletError<Rv>;
+    NotInReservedRange: GenericPalletError;
 
     /**
      * Location already registered with different asset.
      **/
-    LocationAlreadyRegistered: GenericPalletError<Rv>;
+    LocationAlreadyRegistered: GenericPalletError;
 
     /**
      * Origin is forbidden to set/update value.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Balance too low.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Sufficient assets can't be changed to insufficient.
      **/
-    ForbiddenSufficiencyChange: GenericPalletError<Rv>;
+    ForbiddenSufficiencyChange: GenericPalletError;
 
     /**
      * Asset is already banned.
      **/
-    AssetAlreadyBanned: GenericPalletError<Rv>;
+    AssetAlreadyBanned: GenericPalletError;
 
     /**
      * Asset is not banned.
      **/
-    AssetNotBanned: GenericPalletError<Rv>;
+    AssetNotBanned: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -1226,22 +1226,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Ethereum signature is not valid
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Claim is not valid
      **/
-    NoClaimOrAlreadyClaimed: GenericPalletError<Rv>;
+    NoClaimOrAlreadyClaimed: GenericPalletError;
 
     /**
      * Value reached maximum and cannot be incremented further
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorRewards`'s errors
@@ -1250,7 +1250,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Omnipool`'s errors
@@ -1259,167 +1259,167 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Balance too low
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Asset is already in omnipool
      **/
-    AssetAlreadyAdded: GenericPalletError<Rv>;
+    AssetAlreadyAdded: GenericPalletError;
 
     /**
      * Asset is not in omnipool
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Failed to add token to Omnipool due to insufficient initial liquidity.
      **/
-    MissingBalance: GenericPalletError<Rv>;
+    MissingBalance: GenericPalletError;
 
     /**
      * Invalid initial asset price.
      **/
-    InvalidInitialAssetPrice: GenericPalletError<Rv>;
+    InvalidInitialAssetPrice: GenericPalletError;
 
     /**
      * Slippage protection - minimum limit has not been reached.
      **/
-    BuyLimitNotReached: GenericPalletError<Rv>;
+    BuyLimitNotReached: GenericPalletError;
 
     /**
      * Slippage protection - maximum limit has been exceeded.
      **/
-    SellLimitExceeded: GenericPalletError<Rv>;
+    SellLimitExceeded: GenericPalletError;
 
     /**
      * Position has not been found.
      **/
-    PositionNotFound: GenericPalletError<Rv>;
+    PositionNotFound: GenericPalletError;
 
     /**
      * Insufficient shares in position
      **/
-    InsufficientShares: GenericPalletError<Rv>;
+    InsufficientShares: GenericPalletError;
 
     /**
      * Asset is not allowed to be traded.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Signed account is not owner of position instance.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Asset weight cap has been exceeded.
      **/
-    AssetWeightCapExceeded: GenericPalletError<Rv>;
+    AssetWeightCapExceeded: GenericPalletError;
 
     /**
      * Asset is not registered in asset registry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Provided liquidity is below minimum allowed limit
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Traded amount is below minimum allowed limit
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Sell or buy with same asset ids is not allowed.
      **/
-    SameAssetTradeNotAllowed: GenericPalletError<Rv>;
+    SameAssetTradeNotAllowed: GenericPalletError;
 
     /**
      * LRNA update after trade results in positive value.
      **/
-    HubAssetUpdateError: GenericPalletError<Rv>;
+    HubAssetUpdateError: GenericPalletError;
 
     /**
      * Amount of shares provided cannot be 0.
      **/
-    InvalidSharesAmount: GenericPalletError<Rv>;
+    InvalidSharesAmount: GenericPalletError;
 
     /**
      * Hub asset is only allowed to be sold.
      **/
-    InvalidHubAssetTradableState: GenericPalletError<Rv>;
+    InvalidHubAssetTradableState: GenericPalletError;
 
     /**
      * Asset is not allowed to be refunded.
      **/
-    AssetRefundNotAllowed: GenericPalletError<Rv>;
+    AssetRefundNotAllowed: GenericPalletError;
 
     /**
      * Max fraction of asset to buy has been exceeded.
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Max fraction of asset to sell has been exceeded.
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Max allowed price difference has been exceeded.
      **/
-    PriceDifferenceTooHigh: GenericPalletError<Rv>;
+    PriceDifferenceTooHigh: GenericPalletError;
 
     /**
      * Invalid oracle price - division by zero.
      **/
-    InvalidOraclePrice: GenericPalletError<Rv>;
+    InvalidOraclePrice: GenericPalletError;
 
     /**
      * Failed to calculate withdrawal fee.
      **/
-    InvalidWithdrawalFee: GenericPalletError<Rv>;
+    InvalidWithdrawalFee: GenericPalletError;
 
     /**
      * More than allowed amount of fee has been transferred.
      **/
-    FeeOverdraft: GenericPalletError<Rv>;
+    FeeOverdraft: GenericPalletError;
 
     /**
      * Token cannot be removed from Omnipool due to shares still owned by other users.
      **/
-    SharesRemaining: GenericPalletError<Rv>;
+    SharesRemaining: GenericPalletError;
 
     /**
      * Token cannot be removed from Omnipool because asset is not frozen.
      **/
-    AssetNotFrozen: GenericPalletError<Rv>;
+    AssetNotFrozen: GenericPalletError;
 
     /**
      * Calculated amount out from sell trade is zero.
      **/
-    ZeroAmountOut: GenericPalletError<Rv>;
+    ZeroAmountOut: GenericPalletError;
 
     /**
      * Existential deposit of asset is not available.
      **/
-    ExistentialDepositNotAvailable: GenericPalletError<Rv>;
+    ExistentialDepositNotAvailable: GenericPalletError;
 
     /**
      * Slippage protection
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Extra protocol fee has not been consumed.
      **/
-    ProtocolFeeNotConsumed: GenericPalletError<Rv>;
+    ProtocolFeeNotConsumed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TransactionPause`'s errors
@@ -1428,22 +1428,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * can not pause
      **/
-    CannotPause: GenericPalletError<Rv>;
+    CannotPause: GenericPalletError;
 
     /**
      * invalid character encoding
      **/
-    InvalidCharacter: GenericPalletError<Rv>;
+    InvalidCharacter: GenericPalletError;
 
     /**
      * pallet name or function name is too long
      **/
-    NameTooLong: GenericPalletError<Rv>;
+    NameTooLong: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Duster`'s errors
@@ -1452,37 +1452,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is excluded from dusting.
      **/
-    AccountWhitelisted: GenericPalletError<Rv>;
+    AccountWhitelisted: GenericPalletError;
 
     /**
      * Account is not present in the non-dustable list.
      **/
-    AccountNotWhitelisted: GenericPalletError<Rv>;
+    AccountNotWhitelisted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * The balance was not fully dusted, there is some leftover on the account. Normally, it should never happen.
      **/
-    NonZeroBalance: GenericPalletError<Rv>;
+    NonZeroBalance: GenericPalletError;
 
     /**
      * The balance is sufficient to keep account open.
      **/
-    BalanceSufficient: GenericPalletError<Rv>;
+    BalanceSufficient: GenericPalletError;
 
     /**
      * Reserve account is not set.
      **/
-    ReserveAccountNotSet: GenericPalletError<Rv>;
+    ReserveAccountNotSet: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s errors
@@ -1491,154 +1491,154 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Global farm does not exist.
      **/
-    GlobalFarmNotFound: GenericPalletError<Rv>;
+    GlobalFarmNotFound: GenericPalletError;
 
     /**
      * Yield farm does not exist.
      **/
-    YieldFarmNotFound: GenericPalletError<Rv>;
+    YieldFarmNotFound: GenericPalletError;
 
     /**
      * Multiple claims in the same period is not allowed.
      **/
-    DoubleClaimInPeriod: GenericPalletError<Rv>;
+    DoubleClaimInPeriod: GenericPalletError;
 
     /**
      * Liquidity mining is canceled.
      **/
-    LiquidityMiningCanceled: GenericPalletError<Rv>;
+    LiquidityMiningCanceled: GenericPalletError;
 
     /**
      * Liquidity mining is not canceled.
      **/
-    LiquidityMiningIsActive: GenericPalletError<Rv>;
+    LiquidityMiningIsActive: GenericPalletError;
 
     /**
      * Liquidity mining is in `active` or `terminated` state and action cannot be completed.
      **/
-    LiquidityMiningIsNotStopped: GenericPalletError<Rv>;
+    LiquidityMiningIsNotStopped: GenericPalletError;
 
     /**
      * Account is not allowed to perform action.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Yield farm multiplier can't be 0.
      **/
-    InvalidMultiplier: GenericPalletError<Rv>;
+    InvalidMultiplier: GenericPalletError;
 
     /**
      * Yield farm with given `amm_pool_id` already exists in global farm.
      **/
-    YieldFarmAlreadyExists: GenericPalletError<Rv>;
+    YieldFarmAlreadyExists: GenericPalletError;
 
     /**
      * Loyalty curve's initial reward percentage is not valid. Valid range is: [0, 1).
      **/
-    InvalidInitialRewardPercentage: GenericPalletError<Rv>;
+    InvalidInitialRewardPercentage: GenericPalletError;
 
     /**
      * One or more yield farms exist in global farm.
      **/
-    GlobalFarmIsNotEmpty: GenericPalletError<Rv>;
+    GlobalFarmIsNotEmpty: GenericPalletError;
 
     /**
      * Farm's `incentivized_asset` is missing in provided asset pair.
      **/
-    MissingIncentivizedAsset: GenericPalletError<Rv>;
+    MissingIncentivizedAsset: GenericPalletError;
 
     /**
      * Reward currency balance is not sufficient.
      **/
-    InsufficientRewardCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientRewardCurrencyBalance: GenericPalletError;
 
     /**
      * Blocks per period can't be 0.
      **/
-    InvalidBlocksPerPeriod: GenericPalletError<Rv>;
+    InvalidBlocksPerPeriod: GenericPalletError;
 
     /**
      * Yield per period can't be 0.
      **/
-    InvalidYieldPerPeriod: GenericPalletError<Rv>;
+    InvalidYieldPerPeriod: GenericPalletError;
 
     /**
      * Total rewards is less than `MinTotalFarmRewards`.
      **/
-    InvalidTotalRewards: GenericPalletError<Rv>;
+    InvalidTotalRewards: GenericPalletError;
 
     /**
      * Planned yielding periods is less than `MinPlannedYieldingPeriods`.
      **/
-    InvalidPlannedYieldingPeriods: GenericPalletError<Rv>;
+    InvalidPlannedYieldingPeriods: GenericPalletError;
 
     /**
      * Maximum number of locks reached for deposit.
      **/
-    MaxEntriesPerDeposit: GenericPalletError<Rv>;
+    MaxEntriesPerDeposit: GenericPalletError;
 
     /**
      * Trying to lock LP shares into already locked yield farm.
      **/
-    DoubleLock: GenericPalletError<Rv>;
+    DoubleLock: GenericPalletError;
 
     /**
      * Yield farm entry doesn't exist for given deposit.
      **/
-    YieldFarmEntryNotFound: GenericPalletError<Rv>;
+    YieldFarmEntryNotFound: GenericPalletError;
 
     /**
      * Max number of yield farms in global farm was reached. Global farm can't accept new
      * yield farms until some yield farm is not removed from storage.
      **/
-    GlobalFarmIsFull: GenericPalletError<Rv>;
+    GlobalFarmIsFull: GenericPalletError;
 
     /**
      * Invalid min. deposit was set for global farm.
      **/
-    InvalidMinDeposit: GenericPalletError<Rv>;
+    InvalidMinDeposit: GenericPalletError;
 
     /**
      * Price adjustment multiplier can't be 0.
      **/
-    InvalidPriceAdjustment: GenericPalletError<Rv>;
+    InvalidPriceAdjustment: GenericPalletError;
 
     /**
      * Account creation from id failed.
      **/
-    ErrorGetAccountId: GenericPalletError<Rv>;
+    ErrorGetAccountId: GenericPalletError;
 
     /**
      * Value of deposited shares amount in reward currency is bellow min. limit.
      **/
-    IncorrectValuedShares: GenericPalletError<Rv>;
+    IncorrectValuedShares: GenericPalletError;
 
     /**
      * `reward_currency` is not registered in asset registry.
      **/
-    RewardCurrencyNotRegistered: GenericPalletError<Rv>;
+    RewardCurrencyNotRegistered: GenericPalletError;
 
     /**
      * `incentivized_asset` is not registered in asset registry.
      **/
-    IncentivizedAssetNotRegistered: GenericPalletError<Rv>;
+    IncentivizedAssetNotRegistered: GenericPalletError;
 
     /**
      * Provided `amm_pool_id` doesn't match deposit's `amm_pool_id`.
      **/
-    AmmPoolIdMismatch: GenericPalletError<Rv>;
+    AmmPoolIdMismatch: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s errors
@@ -1647,43 +1647,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset is not in the omnipool.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Signed account is not owner of the deposit.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Rewards to claim are 0.
      **/
-    ZeroClaimedRewards: GenericPalletError<Rv>;
+    ZeroClaimedRewards: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Oracle could not be found for requested assets.
      **/
-    OracleNotAvailable: GenericPalletError<Rv>;
+    OracleNotAvailable: GenericPalletError;
 
     /**
      * Oracle providing `price_adjustment` could not be found for requested assets.
      **/
-    PriceAdjustmentNotAvailable: GenericPalletError<Rv>;
+    PriceAdjustmentNotAvailable: GenericPalletError;
 
     /**
      * No farms specified to join
      **/
-    NoFarmEntriesSpecified: GenericPalletError<Rv>;
+    NoFarmEntriesSpecified: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OTC`'s errors
@@ -1692,49 +1692,49 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset does not exist in registry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Order cannot be found
      **/
-    OrderNotFound: GenericPalletError<Rv>;
+    OrderNotFound: GenericPalletError;
 
     /**
      * Size of order ID exceeds the bound
      **/
-    OrderIdOutOfBound: GenericPalletError<Rv>;
+    OrderIdOutOfBound: GenericPalletError;
 
     /**
      * Cannot partially fill an order which is not partially fillable
      **/
-    OrderNotPartiallyFillable: GenericPalletError<Rv>;
+    OrderNotPartiallyFillable: GenericPalletError;
 
     /**
      * Order amount_in and amount_out must at all times be greater than the existential deposit
      * for the asset multiplied by the ExistentialDepositMultiplier.
      * A fill order may not leave behind amounts smaller than this.
      **/
-    OrderAmountTooSmall: GenericPalletError<Rv>;
+    OrderAmountTooSmall: GenericPalletError;
 
     /**
      * Error with math calculations
      **/
-    MathError: GenericPalletError<Rv>;
+    MathError: GenericPalletError;
 
     /**
      * The caller does not have permission to complete the action
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Reserved amount not sufficient.
      **/
-    InsufficientReservedAmount: GenericPalletError<Rv>;
+    InsufficientReservedAmount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CircuitBreaker`'s errors
@@ -1743,54 +1743,54 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid value for a limit. Limit must be non-zero.
      **/
-    InvalidLimitValue: GenericPalletError<Rv>;
+    InvalidLimitValue: GenericPalletError;
 
     /**
      * Allowed liquidity limit is not stored for asset
      **/
-    LiquidityLimitNotStoredForAsset: GenericPalletError<Rv>;
+    LiquidityLimitNotStoredForAsset: GenericPalletError;
 
     /**
      * Token trade outflow per block has been reached
      **/
-    TokenOutflowLimitReached: GenericPalletError<Rv>;
+    TokenOutflowLimitReached: GenericPalletError;
 
     /**
      * Token trade influx per block has been reached
      **/
-    TokenInfluxLimitReached: GenericPalletError<Rv>;
+    TokenInfluxLimitReached: GenericPalletError;
 
     /**
      * Maximum pool's liquidity limit per block has been reached
      **/
-    MaxLiquidityLimitPerBlockReached: GenericPalletError<Rv>;
+    MaxLiquidityLimitPerBlockReached: GenericPalletError;
 
     /**
      * Asset is not allowed to have a limit
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Asset still in lockdown as it reached the allowed deposit limit for the period
      * Query the `asset_lockdown_state` storage to determine until which block the asset is locked,
      * so that the deposit can be released afterward.
      **/
-    AssetInLockdown: GenericPalletError<Rv>;
+    AssetInLockdown: GenericPalletError;
 
     /**
      * Asset is not in a lockdown
      **/
-    AssetNotInLockdown: GenericPalletError<Rv>;
+    AssetNotInLockdown: GenericPalletError;
 
     /**
      * Invalid amount to save deposit
      **/
-    InvalidAmount: GenericPalletError<Rv>;
+    InvalidAmount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Router`'s errors
@@ -1799,57 +1799,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The trading limit has been reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * The the max number of trades limit is reached
      **/
-    MaxTradesExceeded: GenericPalletError<Rv>;
+    MaxTradesExceeded: GenericPalletError;
 
     /**
      * The AMM pool is not supported for executing trades
      **/
-    PoolNotSupported: GenericPalletError<Rv>;
+    PoolNotSupported: GenericPalletError;
 
     /**
      * The user has not enough balance to execute the trade
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * The calculation of route trade amounts failed in the underlying AMM
      **/
-    RouteCalculationFailed: GenericPalletError<Rv>;
+    RouteCalculationFailed: GenericPalletError;
 
     /**
      * The route is invalid
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * The route update was not successful
      **/
-    RouteUpdateIsNotSuccessful: GenericPalletError<Rv>;
+    RouteUpdateIsNotSuccessful: GenericPalletError;
 
     /**
      * Route contains assets that has no oracle data
      **/
-    RouteHasNoOracle: GenericPalletError<Rv>;
+    RouteHasNoOracle: GenericPalletError;
 
     /**
      * The route execution failed in the underlying AMM
      **/
-    InvalidRouteExecution: GenericPalletError<Rv>;
+    InvalidRouteExecution: GenericPalletError;
 
     /**
      * Trading same assets is not allowed.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DynamicFees`'s errors
@@ -1858,12 +1858,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid fee parameters provided
      **/
-    InvalidFeeParameters: GenericPalletError<Rv>;
+    InvalidFeeParameters: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -1872,73 +1872,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Balance is too low.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Staked amount is too low.
      **/
-    InsufficientStake: GenericPalletError<Rv>;
+    InsufficientStake: GenericPalletError;
 
     /**
      * Staking position has not been found.
      **/
-    PositionNotFound: GenericPalletError<Rv>;
+    PositionNotFound: GenericPalletError;
 
     /**
      * Maximum amount of votes were reached for staking position.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Staking is not initialized.
      **/
-    NotInitialized: GenericPalletError<Rv>;
+    NotInitialized: GenericPalletError;
 
     /**
      * Staking is already initialized.
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * Arithmetic error.
      **/
-    Arithmetic: GenericPalletError<Rv>;
+    Arithmetic: GenericPalletError;
 
     /**
      * Pot's balance is zero.
      **/
-    MissingPotBalance: GenericPalletError<Rv>;
+    MissingPotBalance: GenericPalletError;
 
     /**
      * Account's position already exists.
      **/
-    PositionAlreadyExists: GenericPalletError<Rv>;
+    PositionAlreadyExists: GenericPalletError;
 
     /**
      * Signer is not an owner of the staking position.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Position contains registered votes.
      **/
-    ExistingVotes: GenericPalletError<Rv>;
+    ExistingVotes: GenericPalletError;
 
     /**
      * Position contains processed votes. Removed these votes first before increasing stake or claiming.
      **/
-    ExistingProcessedVotes: GenericPalletError<Rv>;
+    ExistingProcessedVotes: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Stableswap`'s errors
@@ -1947,147 +1947,147 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Creating a pool with same assets or less than 2 assets is not allowed.
      **/
-    IncorrectAssets: GenericPalletError<Rv>;
+    IncorrectAssets: GenericPalletError;
 
     /**
      * Maximum number of assets has been exceeded.
      **/
-    MaxAssetsExceeded: GenericPalletError<Rv>;
+    MaxAssetsExceeded: GenericPalletError;
 
     /**
      * A pool with given assets does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * A pool with given assets already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Asset is not in the pool.
      **/
-    AssetNotInPool: GenericPalletError<Rv>;
+    AssetNotInPool: GenericPalletError;
 
     /**
      * Share asset is not registered in Registry.
      **/
-    ShareAssetNotRegistered: GenericPalletError<Rv>;
+    ShareAssetNotRegistered: GenericPalletError;
 
     /**
      * Share asset is amount assets when creating a pool.
      **/
-    ShareAssetInPoolAssets: GenericPalletError<Rv>;
+    ShareAssetInPoolAssets: GenericPalletError;
 
     /**
      * One or more assets are not registered in AssetRegistry
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Invalid asset amount provided. Amount must be greater than zero.
      **/
-    InvalidAssetAmount: GenericPalletError<Rv>;
+    InvalidAssetAmount: GenericPalletError;
 
     /**
      * Balance of an asset is not sufficient to perform a trade.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Balance of a share asset is not sufficient to withdraw liquidity.
      **/
-    InsufficientShares: GenericPalletError<Rv>;
+    InsufficientShares: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Insufficient liquidity left in the pool after withdrawal.
      **/
-    InsufficientLiquidityRemaining: GenericPalletError<Rv>;
+    InsufficientLiquidityRemaining: GenericPalletError;
 
     /**
      * Amount is less than the minimum trading amount configured.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Minimum limit has not been reached during trade.
      **/
-    BuyLimitNotReached: GenericPalletError<Rv>;
+    BuyLimitNotReached: GenericPalletError;
 
     /**
      * Maximum limit has been exceeded during trade.
      **/
-    SellLimitExceeded: GenericPalletError<Rv>;
+    SellLimitExceeded: GenericPalletError;
 
     /**
      * Initial liquidity of asset must be > 0.
      **/
-    InvalidInitialLiquidity: GenericPalletError<Rv>;
+    InvalidInitialLiquidity: GenericPalletError;
 
     /**
      * Amplification is outside configured range.
      **/
-    InvalidAmplification: GenericPalletError<Rv>;
+    InvalidAmplification: GenericPalletError;
 
     /**
      * Remaining balance of share asset is below asset's existential deposit.
      **/
-    InsufficientShareBalance: GenericPalletError<Rv>;
+    InsufficientShareBalance: GenericPalletError;
 
     /**
      * Not allowed to perform an operation on given asset.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Future block number is in the past.
      **/
-    PastBlock: GenericPalletError<Rv>;
+    PastBlock: GenericPalletError;
 
     /**
      * New amplification is equal to the previous value.
      **/
-    SameAmplification: GenericPalletError<Rv>;
+    SameAmplification: GenericPalletError;
 
     /**
      * Slippage protection.
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Failed to retrieve asset decimals.
      **/
-    UnknownDecimals: GenericPalletError<Rv>;
+    UnknownDecimals: GenericPalletError;
 
     /**
      * List of provided pegs is incorrect.
      **/
-    IncorrectInitialPegs: GenericPalletError<Rv>;
+    IncorrectInitialPegs: GenericPalletError;
 
     /**
      * Failed to retrieve oracle entry.
      **/
-    MissingTargetPegOracle: GenericPalletError<Rv>;
+    MissingTargetPegOracle: GenericPalletError;
 
     /**
      * Creating pool with pegs is not allowed for asset with different decimals.
      **/
-    IncorrectAssetDecimals: GenericPalletError<Rv>;
+    IncorrectAssetDecimals: GenericPalletError;
 
     /**
      * Pool does not have pegs configured.
      **/
-    NoPegSource: GenericPalletError<Rv>;
+    NoPegSource: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bonds`'s errors
@@ -2096,42 +2096,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Bond not registered
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Bond is not mature
      **/
-    NotMature: GenericPalletError<Rv>;
+    NotMature: GenericPalletError;
 
     /**
      * Maturity not long enough
      **/
-    InvalidMaturity: GenericPalletError<Rv>;
+    InvalidMaturity: GenericPalletError;
 
     /**
      * Asset type not allowed for underlying asset
      **/
-    DisallowedAsset: GenericPalletError<Rv>;
+    DisallowedAsset: GenericPalletError;
 
     /**
      * Asset is not registered in `AssetRegistry`
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Generated name is not valid.
      **/
-    InvalidBondName: GenericPalletError<Rv>;
+    InvalidBondName: GenericPalletError;
 
     /**
      * Bond's name parsing was now successful
      **/
-    FailToParseName: GenericPalletError<Rv>;
+    FailToParseName: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OtcSettlements`'s errors
@@ -2140,42 +2140,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Otc order not found
      **/
-    OrderNotFound: GenericPalletError<Rv>;
+    OrderNotFound: GenericPalletError;
 
     /**
      * OTC order is not partially fillable
      **/
-    NotPartiallyFillable: GenericPalletError<Rv>;
+    NotPartiallyFillable: GenericPalletError;
 
     /**
      * Provided route doesn't match the existing route
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * Initial and final balance are different
      **/
-    BalanceInconsistency: GenericPalletError<Rv>;
+    BalanceInconsistency: GenericPalletError;
 
     /**
      * Trade amount higher than necessary
      **/
-    TradeAmountTooHigh: GenericPalletError<Rv>;
+    TradeAmountTooHigh: GenericPalletError;
 
     /**
      * Trade amount lower than necessary
      **/
-    TradeAmountTooLow: GenericPalletError<Rv>;
+    TradeAmountTooLow: GenericPalletError;
 
     /**
      * Price for a route is not available
      **/
-    PriceNotAvailable: GenericPalletError<Rv>;
+    PriceNotAvailable: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `LBP`'s errors
@@ -2184,122 +2184,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pool assets can not be the same
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Account is not a pool owner
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Sale already started
      **/
-    SaleStarted: GenericPalletError<Rv>;
+    SaleStarted: GenericPalletError;
 
     /**
      * Sale is still in progress
      **/
-    SaleNotEnded: GenericPalletError<Rv>;
+    SaleNotEnded: GenericPalletError;
 
     /**
      * Sale is not running
      **/
-    SaleIsNotRunning: GenericPalletError<Rv>;
+    SaleIsNotRunning: GenericPalletError;
 
     /**
      * Sale duration is too long
      **/
-    MaxSaleDurationExceeded: GenericPalletError<Rv>;
+    MaxSaleDurationExceeded: GenericPalletError;
 
     /**
      * Liquidity being added should not be zero
      **/
-    CannotAddZeroLiquidity: GenericPalletError<Rv>;
+    CannotAddZeroLiquidity: GenericPalletError;
 
     /**
      * Asset balance too low
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Pool does not exist
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * Pool has been already created
      **/
-    PoolAlreadyExists: GenericPalletError<Rv>;
+    PoolAlreadyExists: GenericPalletError;
 
     /**
      * Invalid block range
      **/
-    InvalidBlockRange: GenericPalletError<Rv>;
+    InvalidBlockRange: GenericPalletError;
 
     /**
      * Calculation error
      **/
-    WeightCalculationError: GenericPalletError<Rv>;
+    WeightCalculationError: GenericPalletError;
 
     /**
      * Weight set is out of range
      **/
-    InvalidWeight: GenericPalletError<Rv>;
+    InvalidWeight: GenericPalletError;
 
     /**
      * Can not perform a trade with zero amount
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Trade amount is too high
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Invalid fee amount
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Trading limit reached
      **/
-    TradingLimitReached: GenericPalletError<Rv>;
+    TradingLimitReached: GenericPalletError;
 
     /**
      * An unexpected integer overflow occurred
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Nothing to update
      **/
-    NothingToUpdate: GenericPalletError<Rv>;
+    NothingToUpdate: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than minimum trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Not more than one fee collector per asset id
      **/
-    FeeCollectorWithAssetAlreadyUsed: GenericPalletError<Rv>;
+    FeeCollectorWithAssetAlreadyUsed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYK`'s errors
@@ -2308,139 +2308,139 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * It is not allowed to create a pool between same assets.
      **/
-    CannotCreatePoolWithSameAssets: GenericPalletError<Rv>;
+    CannotCreatePoolWithSameAssets: GenericPalletError;
 
     /**
      * Liquidity has not reached the required minimum.
      **/
-    InsufficientLiquidity: GenericPalletError<Rv>;
+    InsufficientLiquidity: GenericPalletError;
 
     /**
      * Amount is less than min trading limit.
      **/
-    InsufficientTradingAmount: GenericPalletError<Rv>;
+    InsufficientTradingAmount: GenericPalletError;
 
     /**
      * Liquidity is zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * It is not allowed to create a pool with zero initial price.
      * Not used, kept for backward compatibility
      **/
-    ZeroInitialPrice: GenericPalletError<Rv>;
+    ZeroInitialPrice: GenericPalletError;
 
     /**
      * Overflow
      * Not used, kept for backward compatibility
      **/
-    CreatePoolAssetAmountInvalid: GenericPalletError<Rv>;
+    CreatePoolAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidMintedLiquidity: GenericPalletError<Rv>;
+    InvalidMintedLiquidity: GenericPalletError;
 
     /**
      * Overflow
      **/
-    InvalidLiquidityAmount: GenericPalletError<Rv>;
+    InvalidLiquidityAmount: GenericPalletError;
 
     /**
      * Asset amount has exceeded given limit.
      **/
-    AssetAmountExceededLimit: GenericPalletError<Rv>;
+    AssetAmountExceededLimit: GenericPalletError;
 
     /**
      * Asset amount has not reached given limit.
      **/
-    AssetAmountNotReachedLimit: GenericPalletError<Rv>;
+    AssetAmountNotReachedLimit: GenericPalletError;
 
     /**
      * Asset balance is not sufficient.
      **/
-    InsufficientAssetBalance: GenericPalletError<Rv>;
+    InsufficientAssetBalance: GenericPalletError;
 
     /**
      * Not enough asset liquidity in the pool.
      **/
-    InsufficientPoolAssetBalance: GenericPalletError<Rv>;
+    InsufficientPoolAssetBalance: GenericPalletError;
 
     /**
      * Not enough core asset liquidity in the pool.
      **/
-    InsufficientNativeCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientNativeCurrencyBalance: GenericPalletError;
 
     /**
      * Liquidity pool for given assets does not exist.
      **/
-    TokenPoolNotFound: GenericPalletError<Rv>;
+    TokenPoolNotFound: GenericPalletError;
 
     /**
      * Liquidity pool for given assets already exists.
      **/
-    TokenPoolAlreadyExists: GenericPalletError<Rv>;
+    TokenPoolAlreadyExists: GenericPalletError;
 
     /**
      * Overflow
      **/
-    AddAssetAmountInvalid: GenericPalletError<Rv>;
+    AddAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    RemoveAssetAmountInvalid: GenericPalletError<Rv>;
+    RemoveAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    SellAssetAmountInvalid: GenericPalletError<Rv>;
+    SellAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    BuyAssetAmountInvalid: GenericPalletError<Rv>;
+    BuyAssetAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    FeeAmountInvalid: GenericPalletError<Rv>;
+    FeeAmountInvalid: GenericPalletError;
 
     /**
      * Overflow
      **/
-    CannotApplyDiscount: GenericPalletError<Rv>;
+    CannotApplyDiscount: GenericPalletError;
 
     /**
      * Max fraction of pool to buy in single transaction has been exceeded.
      **/
-    MaxOutRatioExceeded: GenericPalletError<Rv>;
+    MaxOutRatioExceeded: GenericPalletError;
 
     /**
      * Max fraction of pool to sell in single transaction has been exceeded.
      **/
-    MaxInRatioExceeded: GenericPalletError<Rv>;
+    MaxInRatioExceeded: GenericPalletError;
 
     /**
      * Overflow
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Pool cannot be created due to outside factors.
      **/
-    CannotCreatePool: GenericPalletError<Rv>;
+    CannotCreatePool: GenericPalletError;
 
     /**
      * Slippage protection.
      **/
-    SlippageLimit: GenericPalletError<Rv>;
+    SlippageLimit: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referrals`'s errors
@@ -2449,77 +2449,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referral code is too long.
      **/
-    TooLong: GenericPalletError<Rv>;
+    TooLong: GenericPalletError;
 
     /**
      * Referral code is too short.
      **/
-    TooShort: GenericPalletError<Rv>;
+    TooShort: GenericPalletError;
 
     /**
      * Referral code contains invalid character. Only alphanumeric characters are allowed.
      **/
-    InvalidCharacter: GenericPalletError<Rv>;
+    InvalidCharacter: GenericPalletError;
 
     /**
      * Referral code already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Provided referral code is invalid. Either does not exist or is too long.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Account is already linked to another referral account.
      **/
-    AlreadyLinked: GenericPalletError<Rv>;
+    AlreadyLinked: GenericPalletError;
 
     /**
      * Nothing in the referral pot account for the asset.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Linking an account to the same referral account is not allowed.
      **/
-    LinkNotAllowed: GenericPalletError<Rv>;
+    LinkNotAllowed: GenericPalletError;
 
     /**
      * Calculated rewards are more than the fee amount. This can happen if percentages are incorrectly set.
      **/
-    IncorrectRewardCalculation: GenericPalletError<Rv>;
+    IncorrectRewardCalculation: GenericPalletError;
 
     /**
      * Given referrer and trader percentages exceeds 100% percent.
      **/
-    IncorrectRewardPercentage: GenericPalletError<Rv>;
+    IncorrectRewardPercentage: GenericPalletError;
 
     /**
      * The account has already a code registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * Price for given asset pair not found.
      **/
-    PriceNotFound: GenericPalletError<Rv>;
+    PriceNotFound: GenericPalletError;
 
     /**
      * Minimum trading amount for conversion has not been reached.
      **/
-    ConversionMinTradingAmountNotReached: GenericPalletError<Rv>;
+    ConversionMinTradingAmountNotReached: GenericPalletError;
 
     /**
      * Zero amount received from conversion.
      **/
-    ConversionZeroAmountReceived: GenericPalletError<Rv>;
+    ConversionZeroAmountReceived: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Liquidation`'s errors
@@ -2528,37 +2528,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * AssetId to EVM address conversion failed
      **/
-    AssetConversionFailed: GenericPalletError<Rv>;
+    AssetConversionFailed: GenericPalletError;
 
     /**
      * Liquidation call failed
      **/
-    LiquidationCallFailed: GenericPalletError<Rv>;
+    LiquidationCallFailed: GenericPalletError;
 
     /**
      * Provided route doesn't match the existing route
      **/
-    InvalidRoute: GenericPalletError<Rv>;
+    InvalidRoute: GenericPalletError;
 
     /**
      * Liquidation was not profitable enough to repay flash loan
      **/
-    NotProfitable: GenericPalletError<Rv>;
+    NotProfitable: GenericPalletError;
 
     /**
      * Flash minter contract address not set. It is required for Hollar liquidations.
      **/
-    FlashMinterNotSet: GenericPalletError<Rv>;
+    FlashMinterNotSet: GenericPalletError;
 
     /**
      * Invalid liquidation data provided
      **/
-    InvalidLiquidationData: GenericPalletError<Rv>;
+    InvalidLiquidationData: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `HSM`'s errors
@@ -2569,146 +2569,146 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * The operation attempted to use an asset that is not registered as an approved collateral.
      **/
-    AssetNotApproved: GenericPalletError<Rv>;
+    AssetNotApproved: GenericPalletError;
 
     /**
      * Asset is already approved as collateral
      *
      * Attempted to add an asset that is already registered as a collateral.
      **/
-    AssetAlreadyApproved: GenericPalletError<Rv>;
+    AssetAlreadyApproved: GenericPalletError;
 
     /**
      * Another asset from the same pool is already approved
      *
      * Only one asset from each StableSwap pool can be used as collateral.
      **/
-    PoolAlreadyHasCollateral: GenericPalletError<Rv>;
+    PoolAlreadyHasCollateral: GenericPalletError;
 
     /**
      * Invalid asset pair, must be Hollar and approved collateral
      *
      * The asset pair for buy/sell operations must include Hollar as one side and an approved collateral as the other.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Max buy price exceeded
      *
      * The calculated buy price exceeds the maximum allowed buy price for the collateral.
      **/
-    MaxBuyPriceExceeded: GenericPalletError<Rv>;
+    MaxBuyPriceExceeded: GenericPalletError;
 
     /**
      * Max buy back amount in single block exceeded
      *
      * The amount of Hollar being sold to HSM exceeds the maximum allowed in a single block for this collateral.
      **/
-    MaxBuyBackExceeded: GenericPalletError<Rv>;
+    MaxBuyBackExceeded: GenericPalletError;
 
     /**
      * Max holding amount for collateral exceeded
      *
      * The operation would cause the HSM to hold more of the collateral than the configured maximum.
      **/
-    MaxHoldingExceeded: GenericPalletError<Rv>;
+    MaxHoldingExceeded: GenericPalletError;
 
     /**
      * Slippage limit exceeded
      *
      * The calculated amount is worse than the provided slippage limit.
      **/
-    SlippageLimitExceeded: GenericPalletError<Rv>;
+    SlippageLimitExceeded: GenericPalletError;
 
     /**
      * Invalid EVM contract interaction
      *
      * The call to the EVM contract (GHO Hollar token) failed.
      **/
-    InvalidEVMInteraction: GenericPalletError<Rv>;
+    InvalidEVMInteraction: GenericPalletError;
 
     /**
      * Decimal retrieval failed
      *
      * Failed to retrieve the decimal information for an asset.
      **/
-    DecimalRetrievalFailed: GenericPalletError<Rv>;
+    DecimalRetrievalFailed: GenericPalletError;
 
     /**
      * No arbitrage opportunity
      *
      * There is no profitable arbitrage opportunity for the specified collateral.
      **/
-    NoArbitrageOpportunity: GenericPalletError<Rv>;
+    NoArbitrageOpportunity: GenericPalletError;
 
     /**
      * Asset not in the pool
      *
      * The specified asset was not found in the pool.
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * Provided pool state is invalid
      *
      * The retrieved pool state has inconsistent or invalid data.
      **/
-    InvalidPoolState: GenericPalletError<Rv>;
+    InvalidPoolState: GenericPalletError;
 
     /**
      * Collateral is not empty
      *
      * Cannot remove a collateral asset that still has a non-zero balance in the HSM account.
      **/
-    CollateralNotEmpty: GenericPalletError<Rv>;
+    CollateralNotEmpty: GenericPalletError;
 
     /**
      * Asset not in the pool
      *
      * The collateral asset is not present in the specified pool.
      **/
-    AssetNotInPool: GenericPalletError<Rv>;
+    AssetNotInPool: GenericPalletError;
 
     /**
      * Hollar is not in the pool
      *
      * The Hollar asset is not present in the specified pool.
      **/
-    HollarNotInPool: GenericPalletError<Rv>;
+    HollarNotInPool: GenericPalletError;
 
     /**
      * Insufficient collateral balance
      *
      * The HSM does not have enough of the collateral asset to complete the operation.
      **/
-    InsufficientCollateralBalance: GenericPalletError<Rv>;
+    InsufficientCollateralBalance: GenericPalletError;
 
     /**
      * GHO Contract address not found
      *
      * The EVM address for the GHO (Hollar) token contract was not found.
      **/
-    HollarContractAddressNotFound: GenericPalletError<Rv>;
+    HollarContractAddressNotFound: GenericPalletError;
 
     /**
      * HSM contains maximum number of allowed collateral assets.
      **/
-    MaxNumberOfCollateralsReached: GenericPalletError<Rv>;
+    MaxNumberOfCollateralsReached: GenericPalletError;
 
     /**
      * Flash minter address not set
      **/
-    FlashMinterNotSet: GenericPalletError<Rv>;
+    FlashMinterNotSet: GenericPalletError;
 
     /**
      * Provided arbitrage data is invalid
      **/
-    InvalidArbitrageData: GenericPalletError<Rv>;
+    InvalidArbitrageData: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Tokens`'s errors
@@ -2717,43 +2717,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Cannot convert Amount into Balance type
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Failed because liquidity restrictions due to locking
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Failed because the maximum locks was exceeded
      **/
-    MaxLocksExceeded: GenericPalletError<Rv>;
+    MaxLocksExceeded: GenericPalletError;
 
     /**
      * Transfer/payment would kill account
      **/
-    KeepAlive: GenericPalletError<Rv>;
+    KeepAlive: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist
      **/
-    DeadAccount: GenericPalletError<Rv>;
-    TooManyReserves: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Currencies`'s errors
@@ -2762,27 +2762,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Unable to convert the Amount type into Balance.
      **/
-    AmountIntoBalanceFailed: GenericPalletError<Rv>;
+    AmountIntoBalanceFailed: GenericPalletError;
 
     /**
      * Balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * Deposit result is not expected
      **/
-    DepositFailed: GenericPalletError<Rv>;
+    DepositFailed: GenericPalletError;
 
     /**
      * Operation is not supported for this currency
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -2791,37 +2791,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting period is zero
      **/
-    ZeroVestingPeriod: GenericPalletError<Rv>;
+    ZeroVestingPeriod: GenericPalletError;
 
     /**
      * Number of vests is zero
      **/
-    ZeroVestingPeriodCount: GenericPalletError<Rv>;
+    ZeroVestingPeriodCount: GenericPalletError;
 
     /**
      * Insufficient amount of balance to lock
      **/
-    InsufficientBalanceToLock: GenericPalletError<Rv>;
+    InsufficientBalanceToLock: GenericPalletError;
 
     /**
      * This account have too many vesting schedules
      **/
-    TooManyVestingSchedules: GenericPalletError<Rv>;
+    TooManyVestingSchedules: GenericPalletError;
 
     /**
      * The vested transfer amount is too low
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * Failed because the maximum vesting schedules was exceeded
      **/
-    MaxVestingSchedulesExceeded: GenericPalletError<Rv>;
+    MaxVestingSchedulesExceeded: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVM`'s errors
@@ -2830,72 +2830,72 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not enough balance to perform action
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * Calculating total fee overflowed
      **/
-    FeeOverflow: GenericPalletError<Rv>;
+    FeeOverflow: GenericPalletError;
 
     /**
      * Calculating total payment overflowed
      **/
-    PaymentOverflow: GenericPalletError<Rv>;
+    PaymentOverflow: GenericPalletError;
 
     /**
      * Withdraw fee failed
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Gas price is too low.
      **/
-    GasPriceTooLow: GenericPalletError<Rv>;
+    GasPriceTooLow: GenericPalletError;
 
     /**
      * Nonce is invalid
      **/
-    InvalidNonce: GenericPalletError<Rv>;
+    InvalidNonce: GenericPalletError;
 
     /**
      * Gas limit is too low.
      **/
-    GasLimitTooLow: GenericPalletError<Rv>;
+    GasLimitTooLow: GenericPalletError;
 
     /**
      * Gas limit is too high.
      **/
-    GasLimitTooHigh: GenericPalletError<Rv>;
+    GasLimitTooHigh: GenericPalletError;
 
     /**
      * The chain id is invalid.
      **/
-    InvalidChainId: GenericPalletError<Rv>;
+    InvalidChainId: GenericPalletError;
 
     /**
      * the signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * EVM reentrancy
      **/
-    Reentrancy: GenericPalletError<Rv>;
+    Reentrancy: GenericPalletError;
 
     /**
      * EIP-3607,
      **/
-    TransactionMustComeFromEOA: GenericPalletError<Rv>;
+    TransactionMustComeFromEOA: GenericPalletError;
 
     /**
      * Undefined error.
      **/
-    Undefined: GenericPalletError<Rv>;
+    Undefined: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Ethereum`'s errors
@@ -2904,17 +2904,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Signature is invalid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Pre-log is present, therefore transact is not allowed.
      **/
-    PreLogExists: GenericPalletError<Rv>;
+    PreLogExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EVMAccounts`'s errors
@@ -2923,27 +2923,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Active EVM account cannot be bound
      **/
-    TruncatedAccountAlreadyUsed: GenericPalletError<Rv>;
+    TruncatedAccountAlreadyUsed: GenericPalletError;
 
     /**
      * Address is already bound
      **/
-    AddressAlreadyBound: GenericPalletError<Rv>;
+    AddressAlreadyBound: GenericPalletError;
 
     /**
      * Bound address cannot be used
      **/
-    BoundAddressCannotBeUsed: GenericPalletError<Rv>;
+    BoundAddressCannotBeUsed: GenericPalletError;
 
     /**
      * Address not whitelisted
      **/
-    AddressNotWhitelisted: GenericPalletError<Rv>;
+    AddressNotWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKLiquidityMining`'s errors
@@ -2952,72 +2952,72 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Nft pallet didn't return an owner.
      **/
-    CantFindDepositOwner: GenericPalletError<Rv>;
+    CantFindDepositOwner: GenericPalletError;
 
     /**
      * Account balance of XYK pool shares is not sufficient.
      **/
-    InsufficientXykSharesBalance: GenericPalletError<Rv>;
+    InsufficientXykSharesBalance: GenericPalletError;
 
     /**
      * XYK pool does not exist
      **/
-    XykPoolDoesntExist: GenericPalletError<Rv>;
+    XykPoolDoesntExist: GenericPalletError;
 
     /**
      * Account is not deposit owner.
      **/
-    NotDepositOwner: GenericPalletError<Rv>;
+    NotDepositOwner: GenericPalletError;
 
     /**
      * XYK did not return assets for given pool id
      **/
-    CantGetXykAssets: GenericPalletError<Rv>;
+    CantGetXykAssets: GenericPalletError;
 
     /**
      * Deposit data not found
      **/
-    DepositDataNotFound: GenericPalletError<Rv>;
+    DepositDataNotFound: GenericPalletError;
 
     /**
      * Calculated reward to claim is 0.
      **/
-    ZeroClaimedRewards: GenericPalletError<Rv>;
+    ZeroClaimedRewards: GenericPalletError;
 
     /**
      * Asset is not in the `AssetPair`.
      **/
-    AssetNotInAssetPair: GenericPalletError<Rv>;
+    AssetNotInAssetPair: GenericPalletError;
 
     /**
      * Provided `AssetPair` is not used by the deposit.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Asset is not registered in asset registry.
      **/
-    AssetNotRegistered: GenericPalletError<Rv>;
+    AssetNotRegistered: GenericPalletError;
 
     /**
      * Failed to calculate `pot`'s account.
      **/
-    FailToGetPotId: GenericPalletError<Rv>;
+    FailToGetPotId: GenericPalletError;
 
     /**
      * No global farm - yield farm pairs specified to join
      **/
-    NoFarmsSpecified: GenericPalletError<Rv>;
+    NoFarmsSpecified: GenericPalletError;
 
     /**
      * Failed to calculate value of xyk shares
      **/
-    FailedToValueShares: GenericPalletError<Rv>;
+    FailedToValueShares: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XYKWarehouseLM`'s errors
@@ -3026,154 +3026,154 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Global farm does not exist.
      **/
-    GlobalFarmNotFound: GenericPalletError<Rv>;
+    GlobalFarmNotFound: GenericPalletError;
 
     /**
      * Yield farm does not exist.
      **/
-    YieldFarmNotFound: GenericPalletError<Rv>;
+    YieldFarmNotFound: GenericPalletError;
 
     /**
      * Multiple claims in the same period is not allowed.
      **/
-    DoubleClaimInPeriod: GenericPalletError<Rv>;
+    DoubleClaimInPeriod: GenericPalletError;
 
     /**
      * Liquidity mining is canceled.
      **/
-    LiquidityMiningCanceled: GenericPalletError<Rv>;
+    LiquidityMiningCanceled: GenericPalletError;
 
     /**
      * Liquidity mining is not canceled.
      **/
-    LiquidityMiningIsActive: GenericPalletError<Rv>;
+    LiquidityMiningIsActive: GenericPalletError;
 
     /**
      * Liquidity mining is in `active` or `terminated` state and action cannot be completed.
      **/
-    LiquidityMiningIsNotStopped: GenericPalletError<Rv>;
+    LiquidityMiningIsNotStopped: GenericPalletError;
 
     /**
      * Account is not allowed to perform action.
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * Yield farm multiplier can't be 0.
      **/
-    InvalidMultiplier: GenericPalletError<Rv>;
+    InvalidMultiplier: GenericPalletError;
 
     /**
      * Yield farm with given `amm_pool_id` already exists in global farm.
      **/
-    YieldFarmAlreadyExists: GenericPalletError<Rv>;
+    YieldFarmAlreadyExists: GenericPalletError;
 
     /**
      * Loyalty curve's initial reward percentage is not valid. Valid range is: [0, 1).
      **/
-    InvalidInitialRewardPercentage: GenericPalletError<Rv>;
+    InvalidInitialRewardPercentage: GenericPalletError;
 
     /**
      * One or more yield farms exist in global farm.
      **/
-    GlobalFarmIsNotEmpty: GenericPalletError<Rv>;
+    GlobalFarmIsNotEmpty: GenericPalletError;
 
     /**
      * Farm's `incentivized_asset` is missing in provided asset pair.
      **/
-    MissingIncentivizedAsset: GenericPalletError<Rv>;
+    MissingIncentivizedAsset: GenericPalletError;
 
     /**
      * Reward currency balance is not sufficient.
      **/
-    InsufficientRewardCurrencyBalance: GenericPalletError<Rv>;
+    InsufficientRewardCurrencyBalance: GenericPalletError;
 
     /**
      * Blocks per period can't be 0.
      **/
-    InvalidBlocksPerPeriod: GenericPalletError<Rv>;
+    InvalidBlocksPerPeriod: GenericPalletError;
 
     /**
      * Yield per period can't be 0.
      **/
-    InvalidYieldPerPeriod: GenericPalletError<Rv>;
+    InvalidYieldPerPeriod: GenericPalletError;
 
     /**
      * Total rewards is less than `MinTotalFarmRewards`.
      **/
-    InvalidTotalRewards: GenericPalletError<Rv>;
+    InvalidTotalRewards: GenericPalletError;
 
     /**
      * Planned yielding periods is less than `MinPlannedYieldingPeriods`.
      **/
-    InvalidPlannedYieldingPeriods: GenericPalletError<Rv>;
+    InvalidPlannedYieldingPeriods: GenericPalletError;
 
     /**
      * Maximum number of locks reached for deposit.
      **/
-    MaxEntriesPerDeposit: GenericPalletError<Rv>;
+    MaxEntriesPerDeposit: GenericPalletError;
 
     /**
      * Trying to lock LP shares into already locked yield farm.
      **/
-    DoubleLock: GenericPalletError<Rv>;
+    DoubleLock: GenericPalletError;
 
     /**
      * Yield farm entry doesn't exist for given deposit.
      **/
-    YieldFarmEntryNotFound: GenericPalletError<Rv>;
+    YieldFarmEntryNotFound: GenericPalletError;
 
     /**
      * Max number of yield farms in global farm was reached. Global farm can't accept new
      * yield farms until some yield farm is not removed from storage.
      **/
-    GlobalFarmIsFull: GenericPalletError<Rv>;
+    GlobalFarmIsFull: GenericPalletError;
 
     /**
      * Invalid min. deposit was set for global farm.
      **/
-    InvalidMinDeposit: GenericPalletError<Rv>;
+    InvalidMinDeposit: GenericPalletError;
 
     /**
      * Price adjustment multiplier can't be 0.
      **/
-    InvalidPriceAdjustment: GenericPalletError<Rv>;
+    InvalidPriceAdjustment: GenericPalletError;
 
     /**
      * Account creation from id failed.
      **/
-    ErrorGetAccountId: GenericPalletError<Rv>;
+    ErrorGetAccountId: GenericPalletError;
 
     /**
      * Value of deposited shares amount in reward currency is bellow min. limit.
      **/
-    IncorrectValuedShares: GenericPalletError<Rv>;
+    IncorrectValuedShares: GenericPalletError;
 
     /**
      * `reward_currency` is not registered in asset registry.
      **/
-    RewardCurrencyNotRegistered: GenericPalletError<Rv>;
+    RewardCurrencyNotRegistered: GenericPalletError;
 
     /**
      * `incentivized_asset` is not registered in asset registry.
      **/
-    IncentivizedAssetNotRegistered: GenericPalletError<Rv>;
+    IncentivizedAssetNotRegistered: GenericPalletError;
 
     /**
      * Provided `amm_pool_id` doesn't match deposit's `amm_pool_id`.
      **/
-    AmmPoolIdMismatch: GenericPalletError<Rv>;
+    AmmPoolIdMismatch: GenericPalletError;
 
     /**
      * Action cannot be completed because unexpected error has occurred. This should be reported
      * to protocol maintainers.
      **/
-    InconsistentState: GenericPalletError<Rv>;
+    InconsistentState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RelayChainInfo`'s errors
@@ -3182,7 +3182,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DCA`'s errors
@@ -3191,107 +3191,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Schedule not exist
      **/
-    ScheduleNotFound: GenericPalletError<Rv>;
+    ScheduleNotFound: GenericPalletError;
 
     /**
      * The min trade amount is not reached
      **/
-    MinTradeAmountNotReached: GenericPalletError<Rv>;
+    MinTradeAmountNotReached: GenericPalletError;
 
     /**
      * Forbidden as the user is not the owner of the schedule
      **/
-    Forbidden: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
 
     /**
      * The next execution block number is not in the future
      **/
-    BlockNumberIsNotInFuture: GenericPalletError<Rv>;
+    BlockNumberIsNotInFuture: GenericPalletError;
 
     /**
      * Price is unstable as price change from oracle data is bigger than max allowed
      **/
-    PriceUnstable: GenericPalletError<Rv>;
+    PriceUnstable: GenericPalletError;
 
     /**
      * Order was randomly rescheduled to next block
      **/
-    Bumped: GenericPalletError<Rv>;
+    Bumped: GenericPalletError;
 
     /**
      * Error occurred when calculating price
      **/
-    CalculatingPriceError: GenericPalletError<Rv>;
+    CalculatingPriceError: GenericPalletError;
 
     /**
      * The total amount to be reserved is smaller than min budget
      **/
-    TotalAmountIsSmallerThanMinBudget: GenericPalletError<Rv>;
+    TotalAmountIsSmallerThanMinBudget: GenericPalletError;
 
     /**
      * The budget is too low for executing at least two orders
      **/
-    BudgetTooLow: GenericPalletError<Rv>;
+    BudgetTooLow: GenericPalletError;
 
     /**
      * There is no free block found to plan DCA execution
      **/
-    NoFreeBlockFound: GenericPalletError<Rv>;
+    NoFreeBlockFound: GenericPalletError;
 
     /**
      * The DCA schedule has been manually terminated
      **/
-    ManuallyTerminated: GenericPalletError<Rv>;
+    ManuallyTerminated: GenericPalletError;
 
     /**
      * Max number of retries reached for schedule
      **/
-    MaxRetryReached: GenericPalletError<Rv>;
+    MaxRetryReached: GenericPalletError;
 
     /**
      * Absolutely trade limit reached, leading to retry
      **/
-    TradeLimitReached: GenericPalletError<Rv>;
+    TradeLimitReached: GenericPalletError;
 
     /**
      * Slippage limit calculated from oracle is reached, leading to retry
      **/
-    SlippageLimitReached: GenericPalletError<Rv>;
+    SlippageLimitReached: GenericPalletError;
 
     /**
      * No parent hash has been found from relay chain
      **/
-    NoParentHashFound: GenericPalletError<Rv>;
+    NoParentHashFound: GenericPalletError;
 
     /**
      * Error that should not really happen only in case of invalid state of the schedule storage entries
      **/
-    InvalidState: GenericPalletError<Rv>;
+    InvalidState: GenericPalletError;
 
     /**
      * Period should be longer than 5 blocks
      **/
-    PeriodTooShort: GenericPalletError<Rv>;
+    PeriodTooShort: GenericPalletError;
 
     /**
      * Stability threshold cannot be higher than `MaxConfigurablePriceDifferenceBetweenBlock`
      **/
-    StabilityThresholdTooHigh: GenericPalletError<Rv>;
+    StabilityThresholdTooHigh: GenericPalletError;
 
     /**
      * User still has active DCA schedules and cannot unlock reserves
      **/
-    HasActiveSchedules: GenericPalletError<Rv>;
+    HasActiveSchedules: GenericPalletError;
 
     /**
      * No reserves are locked for the user for the given asset
      **/
-    NoReservesLocked: GenericPalletError<Rv>;
+    NoReservesLocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -3300,32 +3300,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -3334,48 +3334,48 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * No code upgrade has been authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The given code upgrade has not been authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -3385,129 +3385,129 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -3516,32 +3516,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -3551,32 +3551,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -3584,24 +3584,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OrmlXcm`'s errors
@@ -3611,24 +3611,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The message and destination combination was not recognized as being
      * reachable.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The message and destination was recognized as being reachable but
      * the operation could not be completed.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XTokens`'s errors
@@ -3637,110 +3637,110 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset has no reserve location.
      **/
-    AssetHasNoReserve: GenericPalletError<Rv>;
+    AssetHasNoReserve: GenericPalletError;
 
     /**
      * Not cross-chain transfer.
      **/
-    NotCrossChainTransfer: GenericPalletError<Rv>;
+    NotCrossChainTransfer: GenericPalletError;
 
     /**
      * Invalid transfer destination.
      **/
-    InvalidDest: GenericPalletError<Rv>;
+    InvalidDest: GenericPalletError;
 
     /**
      * Currency is not cross-chain transferable.
      **/
-    NotCrossChainTransferableCurrency: GenericPalletError<Rv>;
+    NotCrossChainTransferableCurrency: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * XCM execution failed.
      **/
-    XcmExecutionFailed: GenericPalletError<Rv>;
+    XcmExecutionFailed: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the
      * destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Could not get ancestry of asset reserve location.
      **/
-    InvalidAncestry: GenericPalletError<Rv>;
+    InvalidAncestry: GenericPalletError;
 
     /**
      * The Asset is invalid.
      **/
-    InvalidAsset: GenericPalletError<Rv>;
+    InvalidAsset: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be
      * interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * We tried sending distinct asset and fee but they have different
      * reserve chains.
      **/
-    DistinctReserveForAssetAndFee: GenericPalletError<Rv>;
+    DistinctReserveForAssetAndFee: GenericPalletError;
 
     /**
      * The fee is zero.
      **/
-    ZeroFee: GenericPalletError<Rv>;
+    ZeroFee: GenericPalletError;
 
     /**
      * The transfering asset amount is zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * The number of assets to be sent is over the maximum.
      **/
-    TooManyAssetsBeingSent: GenericPalletError<Rv>;
+    TooManyAssetsBeingSent: GenericPalletError;
 
     /**
      * The specified index does not exist in a Assets struct.
      **/
-    AssetIndexNonExistent: GenericPalletError<Rv>;
+    AssetIndexNonExistent: GenericPalletError;
 
     /**
      * Fee is not enough.
      **/
-    FeeNotEnough: GenericPalletError<Rv>;
+    FeeNotEnough: GenericPalletError;
 
     /**
      * Not supported Location
      **/
-    NotSupportedLocation: GenericPalletError<Rv>;
+    NotSupportedLocation: GenericPalletError;
 
     /**
      * MinXcmFee not registered for certain reserve location
      **/
-    MinXcmFeeNotDefined: GenericPalletError<Rv>;
+    MinXcmFeeNotDefined: GenericPalletError;
 
     /**
      * Asset transfer is limited by RateLimiter.
      **/
-    RateLimited: GenericPalletError<Rv>;
+    RateLimited: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `UnknownTokens`'s errors
@@ -3749,22 +3749,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The balance is too low.
      **/
-    BalanceTooLow: GenericPalletError<Rv>;
+    BalanceTooLow: GenericPalletError;
 
     /**
      * The operation will cause balance to overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Unhandled asset.
      **/
-    UnhandledAsset: GenericPalletError<Rv>;
+    UnhandledAsset: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -3773,92 +3773,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -3867,32 +3867,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Ismp`'s errors
@@ -3901,32 +3901,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ISMP message
      **/
-    InvalidMessage: GenericPalletError<Rv>;
+    InvalidMessage: GenericPalletError;
 
     /**
      * Requested message was not found
      **/
-    MessageNotFound: GenericPalletError<Rv>;
+    MessageNotFound: GenericPalletError;
 
     /**
      * Encountered an error while creating the consensus client.
      **/
-    ConsensusClientCreationFailed: GenericPalletError<Rv>;
+    ConsensusClientCreationFailed: GenericPalletError;
 
     /**
      * Couldn't update unbonding period
      **/
-    UnbondingPeriodUpdateFailed: GenericPalletError<Rv>;
+    UnbondingPeriodUpdateFailed: GenericPalletError;
 
     /**
      * Couldn't update challenge period
      **/
-    ChallengePeriodUpdateFailed: GenericPalletError<Rv>;
+    ChallengePeriodUpdateFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Hyperbridge`'s errors
@@ -3935,7 +3935,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TokenGateway`'s errors
@@ -3944,75 +3944,86 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A asset that has not been registered
      **/
-    UnregisteredAsset: GenericPalletError<Rv>;
+    UnregisteredAsset: GenericPalletError;
 
     /**
      * Error while teleporting asset
      **/
-    AssetTeleportError: GenericPalletError<Rv>;
+    AssetTeleportError: GenericPalletError;
 
     /**
      * Coprocessor was not configured in the runtime
      **/
-    CoprocessorNotConfigured: GenericPalletError<Rv>;
+    CoprocessorNotConfigured: GenericPalletError;
 
     /**
      * Asset or update Dispatch Error
      **/
-    DispatchError: GenericPalletError<Rv>;
+    DispatchError: GenericPalletError;
 
     /**
      * Asset Id creation failed
      **/
-    AssetCreationError: GenericPalletError<Rv>;
+    AssetCreationError: GenericPalletError;
 
     /**
      * Asset decimals not found
      **/
-    AssetDecimalsNotFound: GenericPalletError<Rv>;
+    AssetDecimalsNotFound: GenericPalletError;
 
     /**
      * Protocol Params have not been initialized
      **/
-    NotInitialized: GenericPalletError<Rv>;
+    NotInitialized: GenericPalletError;
 
     /**
      * Unknown Asset
      **/
-    UnknownAsset: GenericPalletError<Rv>;
+    UnknownAsset: GenericPalletError;
 
     /**
      * Only root or asset owner can update asset
      **/
-    NotAssetOwner: GenericPalletError<Rv>;
+    NotAssetOwner: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
+  };
+  /**
+   * Pallet `IsmpOracle`'s errors
+   **/
+  ismpOracle: {
+    GetRequestFailed: GenericPalletError;
+
+    /**
+     * Generic pallet error
+     **/
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `EmaOracle`'s errors
    **/
   emaOracle: {
-    TooManyUniqueEntries: GenericPalletError<Rv>;
-    OnTradeValueZero: GenericPalletError<Rv>;
-    OracleNotFound: GenericPalletError<Rv>;
+    TooManyUniqueEntries: GenericPalletError;
+    OnTradeValueZero: GenericPalletError;
+    OracleNotFound: GenericPalletError;
 
     /**
      * Asset not found
      **/
-    AssetNotFound: GenericPalletError<Rv>;
+    AssetNotFound: GenericPalletError;
 
     /**
      * The new price is outside the max allowed range
      **/
-    PriceOutsideAllowedRange: GenericPalletError<Rv>;
+    PriceOutsideAllowedRange: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Broadcast`'s errors
@@ -4021,16 +4032,16 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The execution context call stack has reached its maximum size
      **/
-    ExecutionCallStackOverflow: GenericPalletError<Rv>;
+    ExecutionCallStackOverflow: GenericPalletError;
 
     /**
      * The execution context call stack is empty, unable to decrease level
      **/
-    ExecutionCallStackUnderflow: GenericPalletError<Rv>;
+    ExecutionCallStackUnderflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/events.d.ts b/packages/chaintypes/src/paseo-hydration/events.d.ts
index e5cb8d7e..4b8c5bd1 100644
--- a/packages/chaintypes/src/paseo-hydration/events.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchInfo,
   DispatchError,
@@ -14,6 +14,7 @@ import type {
   Perquintill,
   Perbill,
   H160,
+  U256,
 } from 'dedot/codecs';
 import type {
   FrameSupportTokensMiscBalanceStatus,
@@ -69,6 +70,7 @@ import type {
   IsmpEventsTimeoutHandled,
   IsmpParachainParachainData,
   PalletHyperbridgeVersionedHostParams,
+  IsmpRouterStorageValue,
   PalletBroadcastFiller,
   PalletBroadcastTradeOperation,
   PalletBroadcastAsset,
@@ -76,7 +78,7 @@ import type {
   PalletBroadcastExecutionType,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -84,13 +86,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<Rv, 'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: DispatchInfo }
@@ -99,32 +100,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -133,40 +134,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -175,82 +175,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -261,7 +261,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -270,7 +269,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiTransactionPayment`'s events
@@ -281,7 +280,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [who, currency]
      **/
     CurrencySet: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'CurrencySet',
       { accountId: AccountId32; assetId: number }
@@ -291,20 +289,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New accepted currency added
      * [currency]
      **/
-    CurrencyAdded: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
+    CurrencyAdded: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyAdded', { assetId: number }>;
 
     /**
      * Accepted currency removed
      * [currency]
      **/
-    CurrencyRemoved: GenericPalletEvent<Rv, 'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
+    CurrencyRemoved: GenericPalletEvent<'MultiTransactionPayment', 'CurrencyRemoved', { assetId: number }>;
 
     /**
      * Transaction fee paid in non-native currency
      * [Account, Currency, Native fee amount, Non-native fee amount, Destination account]
      **/
     FeeWithdrawn: GenericPalletEvent<
-      Rv,
       'MultiTransactionPayment',
       'FeeWithdrawn',
       {
@@ -319,7 +316,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -328,38 +325,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -368,18 +359,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       { index: number; assetKind: []; amount: bigint; beneficiary: AccountId32; validFrom: number; expireAt: number }
@@ -388,28 +373,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -419,37 +404,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -458,22 +443,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -482,23 +467,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -508,7 +492,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -517,23 +500,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -543,7 +520,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -554,7 +530,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -563,23 +538,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -588,19 +562,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -609,7 +582,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Democracy`'s events
@@ -618,68 +591,62 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion has been proposed by a public account.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
+    Proposed: GenericPalletEvent<'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * A public proposal has been tabled for referendum vote.
      **/
-    Tabled: GenericPalletEvent<Rv, 'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
+    Tabled: GenericPalletEvent<'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * An external proposal has been tabled.
      **/
-    ExternalTabled: GenericPalletEvent<Rv, 'Democracy', 'ExternalTabled', null>;
+    ExternalTabled: GenericPalletEvent<'Democracy', 'ExternalTabled', null>;
 
     /**
      * A referendum has begun.
      **/
-    Started: GenericPalletEvent<
-      Rv,
-      'Democracy',
-      'Started',
-      { refIndex: number; threshold: PalletDemocracyVoteThreshold }
-    >;
+    Started: GenericPalletEvent<'Democracy', 'Started', { refIndex: number; threshold: PalletDemocracyVoteThreshold }>;
 
     /**
      * A proposal has been approved by referendum.
      **/
-    Passed: GenericPalletEvent<Rv, 'Democracy', 'Passed', { refIndex: number }>;
+    Passed: GenericPalletEvent<'Democracy', 'Passed', { refIndex: number }>;
 
     /**
      * A proposal has been rejected by referendum.
      **/
-    NotPassed: GenericPalletEvent<Rv, 'Democracy', 'NotPassed', { refIndex: number }>;
+    NotPassed: GenericPalletEvent<'Democracy', 'NotPassed', { refIndex: number }>;
 
     /**
      * A referendum has been cancelled.
      **/
-    Cancelled: GenericPalletEvent<Rv, 'Democracy', 'Cancelled', { refIndex: number }>;
+    Cancelled: GenericPalletEvent<'Democracy', 'Cancelled', { refIndex: number }>;
 
     /**
      * An account has delegated their vote to another account.
      **/
-    Delegated: GenericPalletEvent<Rv, 'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
+    Delegated: GenericPalletEvent<'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
 
     /**
      * An account has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'Democracy', 'Undelegated', { account: AccountId32 }>;
+    Undelegated: GenericPalletEvent<'Democracy', 'Undelegated', { account: AccountId32 }>;
 
     /**
      * An external proposal has been vetoed.
      **/
-    Vetoed: GenericPalletEvent<Rv, 'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
+    Vetoed: GenericPalletEvent<'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
 
     /**
      * A proposal_hash has been blacklisted permanently.
      **/
-    Blacklisted: GenericPalletEvent<Rv, 'Democracy', 'Blacklisted', { proposalHash: H256 }>;
+    Blacklisted: GenericPalletEvent<'Democracy', 'Blacklisted', { proposalHash: H256 }>;
 
     /**
      * An account has voted in a referendum
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Democracy',
       'Voted',
       { voter: AccountId32; refIndex: number; vote: PalletDemocracyVoteAccountVote }
@@ -688,18 +655,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has secconded a proposal
      **/
-    Seconded: GenericPalletEvent<Rv, 'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
+    Seconded: GenericPalletEvent<'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
 
     /**
      * A proposal got canceled.
      **/
-    ProposalCanceled: GenericPalletEvent<Rv, 'Democracy', 'ProposalCanceled', { propIndex: number }>;
+    ProposalCanceled: GenericPalletEvent<'Democracy', 'ProposalCanceled', { propIndex: number }>;
 
     /**
      * Metadata for a proposal or a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataSet',
       {
@@ -719,7 +685,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a proposal or a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataCleared',
       {
@@ -739,7 +704,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata has been transferred to new owner.
      **/
     MetadataTransferred: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataTransferred',
       {
@@ -763,7 +727,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommittee`'s events
@@ -774,7 +738,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -785,7 +748,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -794,18 +756,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -815,7 +776,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -824,12 +784,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -838,14 +798,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: HydradxRuntimeSystemProxyType; disambiguationIndex: number }
@@ -854,13 +813,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: HydradxRuntimeSystemProxyType; delay: number }
@@ -870,7 +828,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: HydradxRuntimeSystemProxyType; delay: number }
@@ -879,7 +836,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -889,7 +846,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -899,7 +855,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -909,7 +864,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -925,7 +879,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -934,7 +887,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -943,33 +896,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: bigint; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: bigint; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: bigint; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: bigint }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: bigint }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: bigint; item: bigint; from: AccountId32; to: AccountId32 }
@@ -978,38 +925,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: bigint; item: bigint; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: bigint; item: bigint }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: bigint; item: bigint }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: bigint }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: bigint }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: bigint }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: bigint }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: bigint; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: bigint; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1020,7 +966,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -1031,7 +976,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: bigint; item: bigint; owner: AccountId32; delegate: AccountId32 }
@@ -1040,13 +984,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: bigint }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: bigint }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: bigint; data: Bytes; isFrozen: boolean }
@@ -1055,13 +998,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: bigint }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: bigint; item: bigint; data: Bytes; isFrozen: boolean }
@@ -1070,23 +1012,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: bigint; item: bigint }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: bigint; successfulItems: Array<bigint> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: bigint; successfulItems: Array<bigint> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes; value: Bytes }
@@ -1096,7 +1032,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: bigint; maybeItem?: bigint | undefined; key: Bytes }
@@ -1106,7 +1041,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: bigint | undefined }
@@ -1116,7 +1050,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: bigint; maxSupply: number }
@@ -1126,7 +1059,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: bigint; item: bigint; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -1135,13 +1067,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: bigint; item: bigint }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: bigint; item: bigint; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -1150,7 +1081,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -1161,7 +1092,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -1170,22 +1100,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -1194,18 +1124,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account that has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1215,7 +1144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote that been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -1224,7 +1152,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -1234,7 +1162,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -1259,7 +1186,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -1284,7 +1210,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -1309,7 +1234,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -1329,7 +1253,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -1355,7 +1278,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -1366,7 +1288,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -1381,7 +1302,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -1401,7 +1321,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1416,7 +1335,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1436,7 +1354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1456,7 +1373,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1476,7 +1392,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1496,7 +1411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1521,7 +1435,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1541,7 +1454,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1560,16 +1472,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1578,20 +1489,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Dispatcher`'s events
    **/
   dispatcher: {
     TreasuryManagerCallDispatched: GenericPalletEvent<
-      Rv,
       'Dispatcher',
       'TreasuryManagerCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
     >;
     AaveManagerCallDispatched: GenericPalletEvent<
-      Rv,
       'Dispatcher',
       'AaveManagerCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1600,7 +1509,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRegistry`'s events
@@ -1611,7 +1520,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `SufficiencyCheck` triggers this event.
      **/
     ExistentialDepositPaid: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'ExistentialDepositPaid',
       { who: AccountId32; feeAsset: number; amount: bigint }
@@ -1621,7 +1529,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was registered.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Registered',
       {
@@ -1640,7 +1547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset was updated.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'Updated',
       {
@@ -1659,7 +1565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Native location set for an asset.
      **/
     LocationSet: GenericPalletEvent<
-      Rv,
       'AssetRegistry',
       'LocationSet',
       { assetId: number; location: HydradxRuntimeXcmAssetLocation }
@@ -1668,28 +1573,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset was banned.
      **/
-    AssetBanned: GenericPalletEvent<Rv, 'AssetRegistry', 'AssetBanned', { assetId: number }>;
+    AssetBanned: GenericPalletEvent<'AssetRegistry', 'AssetBanned', { assetId: number }>;
 
     /**
      * Asset's ban was removed.
      **/
-    AssetUnbanned: GenericPalletEvent<Rv, 'AssetRegistry', 'AssetUnbanned', { assetId: number }>;
+    AssetUnbanned: GenericPalletEvent<'AssetRegistry', 'AssetUnbanned', { assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
    **/
   claims: {
-    Claim: GenericPalletEvent<Rv, 'Claims', 'Claim', [AccountId32, PalletClaimsEthereumAddress, bigint]>;
+    Claim: GenericPalletEvent<'Claims', 'Claim', [AccountId32, PalletClaimsEthereumAddress, bigint]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorRewards`'s events
@@ -1699,7 +1604,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Collator was rewarded.
      **/
     CollatorRewarded: GenericPalletEvent<
-      Rv,
       'CollatorRewards',
       'CollatorRewarded',
       { who: AccountId32; amount: bigint; currency: number }
@@ -1708,7 +1612,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Omnipool`'s events
@@ -1718,7 +1622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset was added to Omnipool
      **/
     TokenAdded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TokenAdded',
       { assetId: number; initialAmount: bigint; initialPrice: FixedU128 }
@@ -1728,7 +1631,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset was removed from Omnipool
      **/
     TokenRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TokenRemoved',
       { assetId: number; amount: bigint; hubWithdrawn: bigint }
@@ -1738,7 +1640,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity of an asset was added to Omnipool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'LiquidityAdded',
       { who: AccountId32; assetId: number; amount: bigint; positionId: bigint }
@@ -1748,7 +1649,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity of an asset was removed from Omnipool.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'LiquidityRemoved',
       { who: AccountId32; positionId: bigint; assetId: number; sharesRemoved: bigint; fee: FixedU128 }
@@ -1758,7 +1658,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * PRotocol Liquidity was removed from Omnipool.
      **/
     ProtocolLiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'ProtocolLiquidityRemoved',
       { who: AccountId32; assetId: number; amount: bigint; hubAmount: bigint; sharesRemoved: bigint }
@@ -1769,7 +1668,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'SellExecuted',
       {
@@ -1790,7 +1688,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'BuyExecuted',
       {
@@ -1810,7 +1707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP Position was created and NFT instance minted.
      **/
     PositionCreated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'PositionCreated',
       { positionId: bigint; owner: AccountId32; asset: number; amount: bigint; shares: bigint; price: FixedU128 }
@@ -1819,18 +1715,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * LP Position was destroyed and NFT instance burned.
      **/
-    PositionDestroyed: GenericPalletEvent<
-      Rv,
-      'Omnipool',
-      'PositionDestroyed',
-      { positionId: bigint; owner: AccountId32 }
-    >;
+    PositionDestroyed: GenericPalletEvent<'Omnipool', 'PositionDestroyed', { positionId: bigint; owner: AccountId32 }>;
 
     /**
      * LP Position was updated.
      **/
     PositionUpdated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'PositionUpdated',
       { positionId: bigint; owner: AccountId32; asset: number; amount: bigint; shares: bigint; price: FixedU128 }
@@ -1840,7 +1730,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset's tradable state has been updated.
      **/
     TradableStateUpdated: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'TradableStateUpdated',
       { assetId: number; state: PalletOmnipoolTradability }
@@ -1850,7 +1739,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Amount has been refunded for asset which has not been accepted to add to omnipool.
      **/
     AssetRefunded: GenericPalletEvent<
-      Rv,
       'Omnipool',
       'AssetRefunded',
       { assetId: number; amount: bigint; recipient: AccountId32 }
@@ -1859,17 +1747,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset's weight cap has been updated.
      **/
-    AssetWeightCapUpdated: GenericPalletEvent<
-      Rv,
-      'Omnipool',
-      'AssetWeightCapUpdated',
-      { assetId: number; cap: Permill }
-    >;
+    AssetWeightCapUpdated: GenericPalletEvent<'Omnipool', 'AssetWeightCapUpdated', { assetId: number; cap: Permill }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPause`'s events
@@ -1879,7 +1762,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Paused transaction
      **/
     TransactionPaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionPaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -1889,7 +1771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unpaused transaction
      **/
     TransactionUnpaused: GenericPalletEvent<
-      Rv,
       'TransactionPause',
       'TransactionUnpaused',
       { palletNameBytes: Bytes; functionNameBytes: Bytes }
@@ -1898,7 +1779,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Duster`'s events
@@ -1907,22 +1788,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Account dusted.
      **/
-    Dusted: GenericPalletEvent<Rv, 'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
+    Dusted: GenericPalletEvent<'Duster', 'Dusted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Account added to non-dustable list.
      **/
-    Added: GenericPalletEvent<Rv, 'Duster', 'Added', { who: AccountId32 }>;
+    Added: GenericPalletEvent<'Duster', 'Added', { who: AccountId32 }>;
 
     /**
      * Account removed from non-dustable list.
      **/
-    Removed: GenericPalletEvent<Rv, 'Duster', 'Removed', { who: AccountId32 }>;
+    Removed: GenericPalletEvent<'Duster', 'Removed', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s events
@@ -1932,7 +1813,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm accumulated reward per share was updated.
      **/
     GlobalFarmAccRPZUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolWarehouseLM',
       'GlobalFarmAccRPZUpdated',
       { globalFarmId: number; accumulatedRpz: FixedU128; totalSharesZ: bigint }
@@ -1942,7 +1822,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm accumulated reward per valued share was updated.
      **/
     YieldFarmAccRPVSUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolWarehouseLM',
       'YieldFarmAccRPVSUpdated',
       { globalFarmId: number; yieldFarmId: number; accumulatedRpvs: FixedU128; totalValuedShares: bigint }
@@ -1951,17 +1830,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Global farm has no more rewards to distribute in the moment.
      **/
-    AllRewardsDistributed: GenericPalletEvent<
-      Rv,
-      'OmnipoolWarehouseLM',
-      'AllRewardsDistributed',
-      { globalFarmId: number }
-    >;
+    AllRewardsDistributed: GenericPalletEvent<'OmnipoolWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s events
@@ -1971,7 +1845,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New global farm was created.
      **/
     GlobalFarmCreated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmCreated',
       {
@@ -1992,7 +1865,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was updated
      **/
     GlobalFarmUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmUpdated',
       { id: number; plannedYieldingPeriods: number; yieldPerPeriod: Perquintill; minDeposit: bigint }
@@ -2002,7 +1874,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was terminated.
      **/
     GlobalFarmTerminated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'GlobalFarmTerminated',
       { globalFarmId: number; who: AccountId32; rewardCurrency: number; undistributedRewards: bigint }
@@ -2012,7 +1883,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New yield farm was added to the farm.
      **/
     YieldFarmCreated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmCreated',
       {
@@ -2028,7 +1898,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm multiplier was updated.
      **/
     YieldFarmUpdated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmUpdated',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32; multiplier: FixedU128 }
@@ -2038,7 +1907,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for `asset_id` was stopped.
      **/
     YieldFarmStopped: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmStopped',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32 }
@@ -2048,7 +1916,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for `asset_id` was resumed.
      **/
     YieldFarmResumed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmResumed',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32; multiplier: FixedU128 }
@@ -2058,7 +1925,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm was terminated from the global farm.
      **/
     YieldFarmTerminated: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'YieldFarmTerminated',
       { globalFarmId: number; yieldFarmId: number; assetId: number; who: AccountId32 }
@@ -2068,7 +1934,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New LP shares(LP position) were deposited.
      **/
     SharesDeposited: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesDeposited',
       {
@@ -2086,7 +1951,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Already locked LP shares were redeposited to another yield farm.
      **/
     SharesRedeposited: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesRedeposited',
       {
@@ -2104,7 +1968,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards were claimed.
      **/
     RewardClaimed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'RewardClaimed',
       {
@@ -2121,7 +1984,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP shares were withdrawn.
      **/
     SharesWithdrawn: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'SharesWithdrawn',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; amount: bigint; depositId: bigint }
@@ -2131,7 +1993,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All LP shares were unlocked and NFT representing deposit was destroyed.
      **/
     DepositDestroyed: GenericPalletEvent<
-      Rv,
       'OmnipoolLiquidityMining',
       'DepositDestroyed',
       { who: AccountId32; depositId: bigint }
@@ -2140,7 +2001,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OTC`'s events
@@ -2149,14 +2010,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An Order has been cancelled
      **/
-    Cancelled: GenericPalletEvent<Rv, 'OTC', 'Cancelled', { orderId: number }>;
+    Cancelled: GenericPalletEvent<'OTC', 'Cancelled', { orderId: number }>;
 
     /**
      * An Order has been completely filled
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     Filled: GenericPalletEvent<
-      Rv,
       'OTC',
       'Filled',
       { orderId: number; who: AccountId32; amountIn: bigint; amountOut: bigint; fee: bigint }
@@ -2167,7 +2027,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     PartiallyFilled: GenericPalletEvent<
-      Rv,
       'OTC',
       'PartiallyFilled',
       { orderId: number; who: AccountId32; amountIn: bigint; amountOut: bigint; fee: bigint }
@@ -2177,7 +2036,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An Order has been placed
      **/
     Placed: GenericPalletEvent<
-      Rv,
       'OTC',
       'Placed',
       {
@@ -2193,7 +2051,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CircuitBreaker`'s events
@@ -2203,7 +2061,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Trade volume limit of an asset was changed.
      **/
     TradeVolumeLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'TradeVolumeLimitChanged',
       { assetId: number; tradeVolumeLimit: [number, number] }
@@ -2213,7 +2070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Add liquidity limit of an asset was changed.
      **/
     AddLiquidityLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'AddLiquidityLimitChanged',
       { assetId: number; liquidityLimit?: [number, number] | undefined }
@@ -2223,7 +2079,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Remove liquidity limit of an asset was changed.
      **/
     RemoveLiquidityLimitChanged: GenericPalletEvent<
-      Rv,
       'CircuitBreaker',
       'RemoveLiquidityLimitChanged',
       { assetId: number; liquidityLimit?: [number, number] | undefined }
@@ -2232,22 +2087,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset went to lockdown
      **/
-    AssetLockdown: GenericPalletEvent<Rv, 'CircuitBreaker', 'AssetLockdown', { assetId: number; until: number }>;
+    AssetLockdown: GenericPalletEvent<'CircuitBreaker', 'AssetLockdown', { assetId: number; until: number }>;
 
     /**
      * Asset lockdown was removed
      **/
-    AssetLockdownRemoved: GenericPalletEvent<Rv, 'CircuitBreaker', 'AssetLockdownRemoved', { assetId: number }>;
+    AssetLockdownRemoved: GenericPalletEvent<'CircuitBreaker', 'AssetLockdownRemoved', { assetId: number }>;
 
     /**
      * All reserved amount of deposit was released
      **/
-    DepositReleased: GenericPalletEvent<Rv, 'CircuitBreaker', 'DepositReleased', { who: AccountId32; assetId: number }>;
+    DepositReleased: GenericPalletEvent<'CircuitBreaker', 'DepositReleased', { who: AccountId32; assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Router`'s events
@@ -2257,7 +2112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The route with trades has been successfully executed
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Router',
       'Executed',
       { assetIn: number; assetOut: number; amountIn: bigint; amountOut: bigint; eventId: number }
@@ -2266,12 +2120,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The route with trades has been successfully executed
      **/
-    RouteUpdated: GenericPalletEvent<Rv, 'Router', 'RouteUpdated', { assetIds: Array<number> }>;
+    RouteUpdated: GenericPalletEvent<'Router', 'RouteUpdated', { assetIds: Array<number> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DynamicFees`'s events
@@ -2281,7 +2135,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset fee configuration has been set
      **/
     AssetFeeConfigSet: GenericPalletEvent<
-      Rv,
       'DynamicFees',
       'AssetFeeConfigSet',
       { assetId: number; params: PalletDynamicFeesAssetFeeConfig }
@@ -2290,12 +2143,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Asset fee configuration has been removed
      **/
-    AssetFeeConfigRemoved: GenericPalletEvent<Rv, 'DynamicFees', 'AssetFeeConfigRemoved', { assetId: number }>;
+    AssetFeeConfigRemoved: GenericPalletEvent<'DynamicFees', 'AssetFeeConfigRemoved', { assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -2305,7 +2158,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New staking position was created and NFT was minted.
      **/
     PositionCreated: GenericPalletEvent<
-      Rv,
       'Staking',
       'PositionCreated',
       { who: AccountId32; positionId: bigint; stake: bigint }
@@ -2315,7 +2167,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Staked amount for existing position was increased.
      **/
     StakeAdded: GenericPalletEvent<
-      Rv,
       'Staking',
       'StakeAdded',
       {
@@ -2333,7 +2184,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards were claimed.
      **/
     RewardsClaimed: GenericPalletEvent<
-      Rv,
       'Staking',
       'RewardsClaimed',
       {
@@ -2351,7 +2201,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Staked amount was withdrawn and NFT was burned.
      **/
     Unstaked: GenericPalletEvent<
-      Rv,
       'Staking',
       'Unstaked',
       { who: AccountId32; positionId: bigint; unlockedStake: bigint }
@@ -2360,13 +2209,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Staking was initialized.
      **/
-    StakingInitialized: GenericPalletEvent<Rv, 'Staking', 'StakingInitialized', { nonDustableBalance: bigint }>;
+    StakingInitialized: GenericPalletEvent<'Staking', 'StakingInitialized', { nonDustableBalance: bigint }>;
 
     /**
      * Staking's `accumulated_reward_per_stake` was updated.
      **/
     AccumulatedRpsUpdated: GenericPalletEvent<
-      Rv,
       'Staking',
       'AccumulatedRpsUpdated',
       { accumulatedRps: FixedU128; totalStake: bigint }
@@ -2375,7 +2223,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Stableswap`'s events
@@ -2385,7 +2233,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolCreated',
       {
@@ -2400,13 +2247,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pool fee has been updated.
      **/
-    FeeUpdated: GenericPalletEvent<Rv, 'Stableswap', 'FeeUpdated', { poolId: number; fee: Permill }>;
+    FeeUpdated: GenericPalletEvent<'Stableswap', 'FeeUpdated', { poolId: number; fee: Permill }>;
 
     /**
      * Liquidity of an asset was added to a pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'LiquidityAdded',
       { poolId: number; who: AccountId32; shares: bigint; assets: Array<HydradxTraitsStableswapAssetAmount> }
@@ -2416,7 +2262,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity removed.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'LiquidityRemoved',
       {
@@ -2433,7 +2278,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'SellExecuted',
       {
@@ -2452,7 +2296,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'BuyExecuted',
       {
@@ -2470,7 +2313,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset's tradable state has been updated.
      **/
     TradableStateUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'TradableStateUpdated',
       { poolId: number; assetId: number; state: PalletStableswapTradability }
@@ -2480,7 +2322,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Amplification of a pool has been scheduled to change.
      **/
     AmplificationChanging: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'AmplificationChanging',
       {
@@ -2495,13 +2336,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    PoolDestroyed: GenericPalletEvent<Rv, 'Stableswap', 'PoolDestroyed', { poolId: number }>;
+    PoolDestroyed: GenericPalletEvent<'Stableswap', 'PoolDestroyed', { poolId: number }>;
 
     /**
      * Pool peg source has been updated.
      **/
     PoolPegSourceUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolPegSourceUpdated',
       { poolId: number; assetId: number; pegSource: PalletStableswapPegSource }
@@ -2511,7 +2351,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool max peg update has been updated.
      **/
     PoolMaxPegUpdateUpdated: GenericPalletEvent<
-      Rv,
       'Stableswap',
       'PoolMaxPegUpdateUpdated',
       { poolId: number; maxPegUpdate: Perbill }
@@ -2520,7 +2359,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bonds`'s events
@@ -2530,7 +2369,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A bond asset was registered
      **/
     TokenCreated: GenericPalletEvent<
-      Rv,
       'Bonds',
       'TokenCreated',
       { issuer: AccountId32; assetId: number; bondId: number; maturity: bigint }
@@ -2539,22 +2377,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bond were issued
      **/
-    Issued: GenericPalletEvent<
-      Rv,
-      'Bonds',
-      'Issued',
-      { issuer: AccountId32; bondId: number; amount: bigint; fee: bigint }
-    >;
+    Issued: GenericPalletEvent<'Bonds', 'Issued', { issuer: AccountId32; bondId: number; amount: bigint; fee: bigint }>;
 
     /**
      * Bonds were redeemed
      **/
-    Redeemed: GenericPalletEvent<Rv, 'Bonds', 'Redeemed', { who: AccountId32; bondId: number; amount: bigint }>;
+    Redeemed: GenericPalletEvent<'Bonds', 'Redeemed', { who: AccountId32; bondId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OtcSettlements`'s events
@@ -2563,12 +2396,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A trade has been executed
      **/
-    Executed: GenericPalletEvent<Rv, 'OtcSettlements', 'Executed', { assetId: number; profit: bigint }>;
+    Executed: GenericPalletEvent<'OtcSettlements', 'Executed', { assetId: number; profit: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `LBP`'s events
@@ -2577,18 +2410,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pool was created by the `CreatePool` origin.
      **/
-    PoolCreated: GenericPalletEvent<Rv, 'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolCreated: GenericPalletEvent<'LBP', 'PoolCreated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * Pool data were updated.
      **/
-    PoolUpdated: GenericPalletEvent<Rv, 'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
+    PoolUpdated: GenericPalletEvent<'LBP', 'PoolUpdated', { pool: AccountId32; data: PalletLbpPool }>;
 
     /**
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2598,7 +2430,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool and the pool was destroyed.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'LBP',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2609,7 +2440,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'SellExecuted',
       {
@@ -2628,7 +2458,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'LBP',
       'BuyExecuted',
       {
@@ -2645,7 +2474,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYK`'s events
@@ -2655,7 +2484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New liquidity was provided to the pool.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityAdded',
       { who: AccountId32; assetA: number; assetB: number; amountA: bigint; amountB: bigint }
@@ -2665,7 +2493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Liquidity was removed from the pool.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'XYK',
       'LiquidityRemoved',
       { who: AccountId32; assetA: number; assetB: number; shares: bigint }
@@ -2675,7 +2502,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolCreated',
       {
@@ -2692,7 +2518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool was destroyed.
      **/
     PoolDestroyed: GenericPalletEvent<
-      Rv,
       'XYK',
       'PoolDestroyed',
       { who: AccountId32; assetA: number; assetB: number; shareToken: number; pool: AccountId32 }
@@ -2703,7 +2528,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     SellExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'SellExecuted',
       {
@@ -2723,7 +2547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deprecated. Replaced by pallet_broadcast::Swapped
      **/
     BuyExecuted: GenericPalletEvent<
-      Rv,
       'XYK',
       'BuyExecuted',
       {
@@ -2741,7 +2564,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referrals`'s events
@@ -2750,13 +2573,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Referral code has been registered.
      **/
-    CodeRegistered: GenericPalletEvent<Rv, 'Referrals', 'CodeRegistered', { code: Bytes; account: AccountId32 }>;
+    CodeRegistered: GenericPalletEvent<'Referrals', 'CodeRegistered', { code: Bytes; account: AccountId32 }>;
 
     /**
      * Referral code has been linked to an account.
      **/
     CodeLinked: GenericPalletEvent<
-      Rv,
       'Referrals',
       'CodeLinked',
       { account: AccountId32; code: Bytes; referralAccount: AccountId32 }
@@ -2766,7 +2588,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Asset has been converted to RewardAsset.
      **/
     Converted: GenericPalletEvent<
-      Rv,
       'Referrals',
       'Converted',
       { from: PalletReferralsAssetAmount; to: PalletReferralsAssetAmount }
@@ -2776,7 +2597,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards claimed.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Referrals',
       'Claimed',
       { who: AccountId32; referrerRewards: bigint; tradeRewards: bigint }
@@ -2786,7 +2606,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New asset rewards has been set.
      **/
     AssetRewardsUpdated: GenericPalletEvent<
-      Rv,
       'Referrals',
       'AssetRewardsUpdated',
       { assetId: number; level: PalletReferralsLevel; rewards: PalletReferralsFeeDistribution }
@@ -2795,12 +2614,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Referrer reached new level.
      **/
-    LevelUp: GenericPalletEvent<Rv, 'Referrals', 'LevelUp', { who: AccountId32; level: PalletReferralsLevel }>;
+    LevelUp: GenericPalletEvent<'Referrals', 'LevelUp', { who: AccountId32; level: PalletReferralsLevel }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Liquidation`'s events
@@ -2810,16 +2629,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Money market position has been liquidated
      **/
     Liquidated: GenericPalletEvent<
-      Rv,
       'Liquidation',
       'Liquidated',
-      { user: H160; collateralAsset: number; debtAsset: number; debtToCover: bigint; profit: bigint }
+      { user: H160; collateralAsset: number; debtAsset: number; profit: bigint }
     >;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `HSM`'s events
@@ -2837,7 +2655,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `buyback_rate`: Parameter that controls how quickly HSM can buy Hollar with this asset
      **/
     CollateralAdded: GenericPalletEvent<
-      Rv,
       'HSM',
       'CollateralAdded',
       {
@@ -2856,7 +2673,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parameters:
      * - `asset_id`: The ID of the asset removed from collaterals
      **/
-    CollateralRemoved: GenericPalletEvent<Rv, 'HSM', 'CollateralRemoved', { assetId: number }>;
+    CollateralRemoved: GenericPalletEvent<'HSM', 'CollateralRemoved', { assetId: number }>;
 
     /**
      * A collateral asset was updated
@@ -2870,7 +2687,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `max_in_holding`: New max collateral holding if updated (None if not changed)
      **/
     CollateralUpdated: GenericPalletEvent<
-      Rv,
       'HSM',
       'CollateralUpdated',
       {
@@ -2891,7 +2707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * - `hollar_amount`: Amount of Hollar that was included in the arbitrage operation
      **/
     ArbitrageExecuted: GenericPalletEvent<
-      Rv,
       'HSM',
       'ArbitrageExecuted',
       { arbitrage: number; assetId: number; hollarAmount: bigint; profit: bigint }
@@ -2903,12 +2718,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parameters:
      * - `flash_minter`: The EVM address of the flash minter contract
      **/
-    FlashMinterSet: GenericPalletEvent<Rv, 'HSM', 'FlashMinterSet', { flashMinter: H160 }>;
+    FlashMinterSet: GenericPalletEvent<'HSM', 'FlashMinterSet', { flashMinter: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Tokens`'s events
@@ -2917,19 +2732,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Endowed: GenericPalletEvent<'Tokens', 'Endowed', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below
      * ExistentialDeposit, resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Tokens', 'DustLost', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
     Transfer: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Transfer',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2938,24 +2752,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Tokens', 'Reserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<
-      Rv,
-      'Tokens',
-      'Unreserved',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Unreserved: GenericPalletEvent<'Tokens', 'Unreserved', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some reserved balance was repatriated (moved from reserved to
      * another account).
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Tokens',
       'ReserveRepatriated',
       {
@@ -2971,7 +2779,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A balance was set by root.
      **/
     BalanceSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'BalanceSet',
       { currencyId: number; who: AccountId32; free: bigint; reserved: bigint }
@@ -2980,18 +2787,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The total issuance of an currency has been set
      **/
-    TotalIssuanceSet: GenericPalletEvent<Rv, 'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
+    TotalIssuanceSet: GenericPalletEvent<'Tokens', 'TotalIssuanceSet', { currencyId: number; amount: bigint }>;
 
     /**
      * Some balances were withdrawn (e.g. pay for transaction fee)
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Tokens', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some balances were slashed (e.g. due to mis-behavior)
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'Tokens',
       'Slashed',
       { currencyId: number; who: AccountId32; freeAmount: bigint; reservedAmount: bigint }
@@ -3000,13 +2806,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposited some balance into an account
      **/
-    Deposited: GenericPalletEvent<Rv, 'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Tokens', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some funds are locked
      **/
     LockSet: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockSet',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32; amount: bigint }
@@ -3016,7 +2821,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some locked funds were unlocked
      **/
     LockRemoved: GenericPalletEvent<
-      Rv,
       'Tokens',
       'LockRemoved',
       { lockId: FixedBytes<8>; currencyId: number; who: AccountId32 }
@@ -3025,19 +2829,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some free balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Tokens', 'Locked', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some locked balance was freed.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
-    Issued: GenericPalletEvent<Rv, 'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
-    Rescinded: GenericPalletEvent<Rv, 'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Tokens', 'Unlocked', { currencyId: number; who: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Tokens', 'Issued', { currencyId: number; amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Tokens', 'Rescinded', { currencyId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Currencies`'s events
@@ -3047,7 +2851,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Currency transfer success.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Currencies',
       'Transferred',
       { currencyId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -3057,7 +2860,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Update balance success.
      **/
     BalanceUpdated: GenericPalletEvent<
-      Rv,
       'Currencies',
       'BalanceUpdated',
       { currencyId: number; who: AccountId32; amount: bigint }
@@ -3066,27 +2868,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposit success.
      **/
-    Deposited: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Deposited',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Deposited: GenericPalletEvent<'Currencies', 'Deposited', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Withdraw success.
      **/
-    Withdrawn: GenericPalletEvent<
-      Rv,
-      'Currencies',
-      'Withdrawn',
-      { currencyId: number; who: AccountId32; amount: bigint }
-    >;
+    Withdrawn: GenericPalletEvent<'Currencies', 'Withdrawn', { currencyId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -3096,7 +2888,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Added new vesting schedule.
      **/
     VestingScheduleAdded: GenericPalletEvent<
-      Rv,
       'Vesting',
       'VestingScheduleAdded',
       { from: AccountId32; to: AccountId32; vestingSchedule: OrmlVestingVestingSchedule }
@@ -3105,17 +2896,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Claimed vesting.
      **/
-    Claimed: GenericPalletEvent<Rv, 'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
+    Claimed: GenericPalletEvent<'Vesting', 'Claimed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Updated vesting schedules.
      **/
-    VestingSchedulesUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
+    VestingSchedulesUpdated: GenericPalletEvent<'Vesting', 'VestingSchedulesUpdated', { who: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVM`'s events
@@ -3124,32 +2915,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Ethereum events from contracts.
      **/
-    Log: GenericPalletEvent<Rv, 'EVM', 'Log', { log: EthereumLog }>;
+    Log: GenericPalletEvent<'EVM', 'Log', { log: EthereumLog }>;
 
     /**
      * A contract has been created at given address.
      **/
-    Created: GenericPalletEvent<Rv, 'EVM', 'Created', { address: H160 }>;
+    Created: GenericPalletEvent<'EVM', 'Created', { address: H160 }>;
 
     /**
      * A contract was attempted to be created, but the execution failed.
      **/
-    CreatedFailed: GenericPalletEvent<Rv, 'EVM', 'CreatedFailed', { address: H160 }>;
+    CreatedFailed: GenericPalletEvent<'EVM', 'CreatedFailed', { address: H160 }>;
 
     /**
      * A contract has been executed successfully with states applied.
      **/
-    Executed: GenericPalletEvent<Rv, 'EVM', 'Executed', { address: H160 }>;
+    Executed: GenericPalletEvent<'EVM', 'Executed', { address: H160 }>;
 
     /**
      * A contract has been executed with errors. States are reverted with only gas fees applied.
      **/
-    ExecutedFailed: GenericPalletEvent<Rv, 'EVM', 'ExecutedFailed', { address: H160 }>;
+    ExecutedFailed: GenericPalletEvent<'EVM', 'ExecutedFailed', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Ethereum`'s events
@@ -3159,7 +2950,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An ethereum transaction was successfully executed.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'Ethereum',
       'Executed',
       { from: H160; to: H160; transactionHash: H256; exitReason: EvmCoreErrorExitReason; extraData: Bytes }
@@ -3168,7 +2958,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EVMAccounts`'s events
@@ -3177,32 +2967,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Binding was created.
      **/
-    Bound: GenericPalletEvent<Rv, 'EVMAccounts', 'Bound', { account: AccountId32; address: H160 }>;
+    Bound: GenericPalletEvent<'EVMAccounts', 'Bound', { account: AccountId32; address: H160 }>;
 
     /**
      * Deployer was added.
      **/
-    DeployerAdded: GenericPalletEvent<Rv, 'EVMAccounts', 'DeployerAdded', { who: H160 }>;
+    DeployerAdded: GenericPalletEvent<'EVMAccounts', 'DeployerAdded', { who: H160 }>;
 
     /**
      * Deployer was removed.
      **/
-    DeployerRemoved: GenericPalletEvent<Rv, 'EVMAccounts', 'DeployerRemoved', { who: H160 }>;
+    DeployerRemoved: GenericPalletEvent<'EVMAccounts', 'DeployerRemoved', { who: H160 }>;
 
     /**
      * Contract was approved.
      **/
-    ContractApproved: GenericPalletEvent<Rv, 'EVMAccounts', 'ContractApproved', { address: H160 }>;
+    ContractApproved: GenericPalletEvent<'EVMAccounts', 'ContractApproved', { address: H160 }>;
 
     /**
      * Contract was disapproved.
      **/
-    ContractDisapproved: GenericPalletEvent<Rv, 'EVMAccounts', 'ContractDisapproved', { address: H160 }>;
+    ContractDisapproved: GenericPalletEvent<'EVMAccounts', 'ContractDisapproved', { address: H160 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKLiquidityMining`'s events
@@ -3212,7 +3002,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New global farm was created.
      **/
     GlobalFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmCreated',
       {
@@ -3234,7 +3023,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm's `price_adjustment` was updated.
      **/
     GlobalFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmUpdated',
       { id: number; priceAdjustment: FixedU128 }
@@ -3244,7 +3032,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New yield farm was added into the farm.
      **/
     YieldFarmCreated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmCreated',
       {
@@ -3260,7 +3047,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm was terminated.
      **/
     GlobalFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'GlobalFarmTerminated',
       { globalFarmId: number; who: AccountId32; rewardCurrency: number; undistributedRewards: bigint }
@@ -3270,7 +3056,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New LP tokens was deposited.
      **/
     SharesDeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesDeposited',
       {
@@ -3287,7 +3072,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP token was redeposited for a new yield farm entry
      **/
     SharesRedeposited: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesRedeposited',
       {
@@ -3304,7 +3088,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Rewards was claimed.
      **/
     RewardClaimed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'RewardClaimed',
       {
@@ -3321,7 +3104,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * LP tokens was withdrawn.
      **/
     SharesWithdrawn: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'SharesWithdrawn',
       {
@@ -3338,7 +3120,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was stopped.
      **/
     YieldFarmStopped: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmStopped',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -3348,7 +3129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm for asset pair was resumed.
      **/
     YieldFarmResumed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmResumed',
       {
@@ -3364,7 +3144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm was terminated from global farm.
      **/
     YieldFarmTerminated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmTerminated',
       { globalFarmId: number; yieldFarmId: number; who: AccountId32; assetPair: PalletXykAssetPair }
@@ -3374,7 +3153,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm multiplier was updated.
      **/
     YieldFarmUpdated: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'YieldFarmUpdated',
       {
@@ -3390,7 +3168,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NFT representing deposit has been destroyed
      **/
     DepositDestroyed: GenericPalletEvent<
-      Rv,
       'XYKLiquidityMining',
       'DepositDestroyed',
       { who: AccountId32; depositId: bigint }
@@ -3399,7 +3176,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XYKWarehouseLM`'s events
@@ -3409,7 +3186,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global farm accumulated reward per share was updated.
      **/
     GlobalFarmAccRPZUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'GlobalFarmAccRPZUpdated',
       { globalFarmId: number; accumulatedRpz: FixedU128; totalSharesZ: bigint }
@@ -3419,7 +3195,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Yield farm accumulated reward per valued share was updated.
      **/
     YieldFarmAccRPVSUpdated: GenericPalletEvent<
-      Rv,
       'XYKWarehouseLM',
       'YieldFarmAccRPVSUpdated',
       { globalFarmId: number; yieldFarmId: number; accumulatedRpvs: FixedU128; totalValuedShares: bigint }
@@ -3428,12 +3203,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Global farm has no more rewards to distribute in the moment.
      **/
-    AllRewardsDistributed: GenericPalletEvent<Rv, 'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
+    AllRewardsDistributed: GenericPalletEvent<'XYKWarehouseLM', 'AllRewardsDistributed', { globalFarmId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RelayChainInfo`'s events
@@ -3444,7 +3219,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * [ Parachain block number, Relaychain Block number ]
      **/
     CurrentBlockNumbers: GenericPalletEvent<
-      Rv,
       'RelayChainInfo',
       'CurrentBlockNumbers',
       { parachainBlockNumber: number; relaychainBlockNumber: number }
@@ -3453,7 +3227,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DCA`'s events
@@ -3462,13 +3236,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA execution is started
      **/
-    ExecutionStarted: GenericPalletEvent<Rv, 'DCA', 'ExecutionStarted', { id: number; block: number }>;
+    ExecutionStarted: GenericPalletEvent<'DCA', 'ExecutionStarted', { id: number; block: number }>;
 
     /**
      * The DCA is scheduled for next execution
      **/
     Scheduled: GenericPalletEvent<
-      Rv,
       'DCA',
       'Scheduled',
       { id: number; who: AccountId32; period: number; totalAmount: bigint; order: PalletDcaOrder }
@@ -3477,18 +3250,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA is planned for blocknumber
      **/
-    ExecutionPlanned: GenericPalletEvent<
-      Rv,
-      'DCA',
-      'ExecutionPlanned',
-      { id: number; who: AccountId32; block: number }
-    >;
+    ExecutionPlanned: GenericPalletEvent<'DCA', 'ExecutionPlanned', { id: number; who: AccountId32; block: number }>;
 
     /**
      * The DCA trade is successfully executed
      **/
     TradeExecuted: GenericPalletEvent<
-      Rv,
       'DCA',
       'TradeExecuted',
       { id: number; who: AccountId32; amountIn: bigint; amountOut: bigint }
@@ -3497,23 +3264,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The DCA trade execution is failed
      **/
-    TradeFailed: GenericPalletEvent<Rv, 'DCA', 'TradeFailed', { id: number; who: AccountId32; error: DispatchError }>;
+    TradeFailed: GenericPalletEvent<'DCA', 'TradeFailed', { id: number; who: AccountId32; error: DispatchError }>;
 
     /**
      * The DCA is terminated and completely removed from the chain
      **/
-    Terminated: GenericPalletEvent<Rv, 'DCA', 'Terminated', { id: number; who: AccountId32; error: DispatchError }>;
+    Terminated: GenericPalletEvent<'DCA', 'Terminated', { id: number; who: AccountId32; error: DispatchError }>;
 
     /**
      * The DCA is completed and completely removed from the chain
      **/
-    Completed: GenericPalletEvent<Rv, 'DCA', 'Completed', { id: number; who: AccountId32 }>;
+    Completed: GenericPalletEvent<'DCA', 'Completed', { id: number; who: AccountId32 }>;
 
     /**
      * Randomness generation failed possibly coming from missing data about relay chain
      **/
     RandomnessGenerationFailed: GenericPalletEvent<
-      Rv,
       'DCA',
       'RandomnessGenerationFailed',
       { block: number; error: DispatchError }
@@ -3522,12 +3288,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * DCA reserve for the given asset have been unlocked for a user
      **/
-    ReserveUnlocked: GenericPalletEvent<Rv, 'DCA', 'ReserveUnlocked', { who: AccountId32; assetId: number }>;
+    ReserveUnlocked: GenericPalletEvent<'DCA', 'ReserveUnlocked', { who: AccountId32; assetId: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -3536,18 +3302,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -3557,7 +3322,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -3567,7 +3331,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3577,7 +3340,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3587,7 +3349,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3598,7 +3359,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3608,7 +3368,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -3617,7 +3376,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -3626,13 +3385,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -3641,18 +3399,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -3662,7 +3419,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -3671,7 +3427,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -3680,13 +3436,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV4TraitsOutcome }>;
 
     /**
      * A XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -3703,7 +3458,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3714,7 +3468,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV4Response }
@@ -3725,7 +3478,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3737,7 +3489,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -3754,7 +3505,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3766,7 +3516,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3778,7 +3527,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV4Location; queryId: bigint; expectedLocation?: StagingXcmV4Location | undefined }
@@ -3794,7 +3542,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3803,13 +3550,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -3821,7 +3567,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV4Location; result: number; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3832,7 +3577,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV4Location; version: number }
@@ -3843,7 +3587,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV4Location; queryId: bigint; error: XcmV3TraitsError }
@@ -3854,7 +3597,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -3870,7 +3612,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV4Location; queryId: bigint }
@@ -3882,7 +3623,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -3898,7 +3638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3908,7 +3647,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3919,7 +3657,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV4Location; cost: StagingXcmV4AssetAssets; messageId: FixedBytes<32> }
@@ -3929,7 +3666,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV4Location; fees: StagingXcmV4AssetAssets }
@@ -3939,7 +3675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV4Location; assets: XcmVersionedAssets }
@@ -3948,12 +3683,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -3963,29 +3698,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV4TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV4TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -3994,12 +3724,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -4009,7 +3739,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -4037,7 +3766,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -4072,7 +3800,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -4102,7 +3829,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -4121,7 +3847,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OrmlXcm`'s events
@@ -4130,12 +3856,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * XCM message sent. \[to, message\]
      **/
-    Sent: GenericPalletEvent<Rv, 'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
+    Sent: GenericPalletEvent<'OrmlXcm', 'Sent', { to: StagingXcmV4Location; message: StagingXcmV4Xcm }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XTokens`'s events
@@ -4145,7 +3871,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Transferred `Asset` with fee.
      **/
     TransferredAssets: GenericPalletEvent<
-      Rv,
       'XTokens',
       'TransferredAssets',
       { sender: AccountId32; assets: StagingXcmV4AssetAssets; fee: StagingXcmV4Asset; dest: StagingXcmV4Location }
@@ -4154,7 +3879,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `UnknownTokens`'s events
@@ -4164,7 +3889,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Deposit success.
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Deposited',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -4174,7 +3898,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdraw success.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'UnknownTokens',
       'Withdrawn',
       { asset: StagingXcmV4Asset; who: StagingXcmV4Location }
@@ -4183,7 +3906,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -4193,7 +3916,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -4202,18 +3924,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -4222,13 +3943,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -4238,7 +3958,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -4247,13 +3966,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -4264,7 +3982,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -4273,7 +3990,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -4283,12 +4000,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Ismp`'s events
@@ -4298,7 +4015,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Emitted when a state machine is successfully updated to a new height
      **/
     StateMachineUpdated: GenericPalletEvent<
-      Rv,
       'Ismp',
       'StateMachineUpdated',
       {
@@ -4318,7 +4034,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Emitted when a state commitment is vetoed by a fisherman
      **/
     StateCommitmentVetoed: GenericPalletEvent<
-      Rv,
       'Ismp',
       'StateCommitmentVetoed',
       {
@@ -4338,7 +4053,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Indicates that a consensus client has been created
      **/
     ConsensusClientCreated: GenericPalletEvent<
-      Rv,
       'Ismp',
       'ConsensusClientCreated',
       {
@@ -4353,7 +4067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Indicates that a consensus client has been created
      **/
     ConsensusClientFrozen: GenericPalletEvent<
-      Rv,
       'Ismp',
       'ConsensusClientFrozen',
       {
@@ -4368,7 +4081,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An Outgoing Response has been deposited
      **/
     Response: GenericPalletEvent<
-      Rv,
       'Ismp',
       'Response',
       {
@@ -4403,7 +4115,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An Outgoing Request has been deposited
      **/
     Request: GenericPalletEvent<
-      Rv,
       'Ismp',
       'Request',
       {
@@ -4433,7 +4144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some errors handling some ismp messages
      **/
     Errors: GenericPalletEvent<
-      Rv,
       'Ismp',
       'Errors',
       {
@@ -4447,37 +4157,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Post Request Handled
      **/
-    PostRequestHandled: GenericPalletEvent<Rv, 'Ismp', 'PostRequestHandled', IsmpEventsRequestResponseHandled>;
+    PostRequestHandled: GenericPalletEvent<'Ismp', 'PostRequestHandled', IsmpEventsRequestResponseHandled>;
 
     /**
      * Post Response Handled
      **/
-    PostResponseHandled: GenericPalletEvent<Rv, 'Ismp', 'PostResponseHandled', IsmpEventsRequestResponseHandled>;
+    PostResponseHandled: GenericPalletEvent<'Ismp', 'PostResponseHandled', IsmpEventsRequestResponseHandled>;
 
     /**
      * Get Response Handled
      **/
-    GetRequestHandled: GenericPalletEvent<Rv, 'Ismp', 'GetRequestHandled', IsmpEventsRequestResponseHandled>;
+    GetRequestHandled: GenericPalletEvent<'Ismp', 'GetRequestHandled', IsmpEventsRequestResponseHandled>;
 
     /**
      * Post request timeout handled
      **/
-    PostRequestTimeoutHandled: GenericPalletEvent<Rv, 'Ismp', 'PostRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
+    PostRequestTimeoutHandled: GenericPalletEvent<'Ismp', 'PostRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
 
     /**
      * Post response timeout handled
      **/
-    PostResponseTimeoutHandled: GenericPalletEvent<Rv, 'Ismp', 'PostResponseTimeoutHandled', IsmpEventsTimeoutHandled>;
+    PostResponseTimeoutHandled: GenericPalletEvent<'Ismp', 'PostResponseTimeoutHandled', IsmpEventsTimeoutHandled>;
 
     /**
      * Get request timeout handled
      **/
-    GetRequestTimeoutHandled: GenericPalletEvent<Rv, 'Ismp', 'GetRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
+    GetRequestTimeoutHandled: GenericPalletEvent<'Ismp', 'GetRequestTimeoutHandled', IsmpEventsTimeoutHandled>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `IsmpParachain`'s events
@@ -4487,7 +4197,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parachains with the `para_ids` have been added to the whitelist
      **/
     ParachainsAdded: GenericPalletEvent<
-      Rv,
       'IsmpParachain',
       'ParachainsAdded',
       {
@@ -4502,7 +4211,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Parachains with the `para_ids` have been removed from the whitelist
      **/
     ParachainsRemoved: GenericPalletEvent<
-      Rv,
       'IsmpParachain',
       'ParachainsRemoved',
       {
@@ -4516,7 +4224,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Hyperbridge`'s events
@@ -4526,7 +4234,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Hyperbridge governance has now updated it's host params on this chain.
      **/
     HostParamsUpdated: GenericPalletEvent<
-      Rv,
       'Hyperbridge',
       'HostParamsUpdated',
       {
@@ -4546,7 +4253,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A relayer has withdrawn some fees
      **/
     RelayerFeeWithdrawn: GenericPalletEvent<
-      Rv,
       'Hyperbridge',
       'RelayerFeeWithdrawn',
       {
@@ -4566,7 +4272,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Hyperbridge has withdrawn it's protocol revenue
      **/
     ProtocolRevenueWithdrawn: GenericPalletEvent<
-      Rv,
       'Hyperbridge',
       'ProtocolRevenueWithdrawn',
       {
@@ -4585,7 +4290,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TokenGateway`'s events
@@ -4595,7 +4300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset has been teleported
      **/
     AssetTeleported: GenericPalletEvent<
-      Rv,
       'TokenGateway',
       'AssetTeleported',
       {
@@ -4630,7 +4334,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset has been received and transferred to the beneficiary's account
      **/
     AssetReceived: GenericPalletEvent<
-      Rv,
       'TokenGateway',
       'AssetReceived',
       {
@@ -4655,7 +4358,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An asset has been refunded and transferred to the beneficiary's account
      **/
     AssetRefunded: GenericPalletEvent<
-      Rv,
       'TokenGateway',
       'AssetRefunded',
       {
@@ -4680,7 +4382,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * ERC6160 asset creation request dispatched to hyperbridge
      **/
     Erc6160AssetRegistrationDispatched: GenericPalletEvent<
-      Rv,
       'TokenGateway',
       'ERC6160AssetRegistrationDispatched',
       {
@@ -4694,7 +4395,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `IsmpOracle`'s events
+   **/
+  ismpOracle: {
+    GetRequestSent: GenericPalletEvent<'IsmpOracle', 'GetRequestSent', { commitment: H256 }>;
+    PostRequestSent: GenericPalletEvent<'IsmpOracle', 'PostRequestSent', { commitment: H256 }>;
+    GetRequestResponded: GenericPalletEvent<
+      'IsmpOracle',
+      'GetRequestResponded',
+      { commitment: H256; storageValues: Array<IsmpRouterStorageValue> }
+    >;
+    WstEthPriceReceived: GenericPalletEvent<
+      'IsmpOracle',
+      'WstEthPriceReceived',
+      { commitment: H256; ethPerWsteth: U256 }
+    >;
+    PostRequestResponded: GenericPalletEvent<'IsmpOracle', 'PostRequestResponded', { commitment: H256 }>;
+    GetRequestTimedOut: GenericPalletEvent<'IsmpOracle', 'GetRequestTimedOut', { commitment: H256 }>;
+    PostResponseTimedOut: GenericPalletEvent<'IsmpOracle', 'PostResponseTimedOut', { commitment: H256 }>;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `EmaOracle`'s events
@@ -4704,7 +4430,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was added to the whitelist.
      **/
     AddedToWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'AddedToWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -4714,7 +4439,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Oracle was removed from the whitelist.
      **/
     RemovedFromWhitelist: GenericPalletEvent<
-      Rv,
       'EmaOracle',
       'RemovedFromWhitelist',
       { source: FixedBytes<8>; assets: [number, number] }
@@ -4723,7 +4447,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Broadcast`'s events
@@ -4740,7 +4464,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      **/
     Swapped3: GenericPalletEvent<
-      Rv,
       'Broadcast',
       'Swapped3',
       {
@@ -4758,6 +4481,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/index.d.ts b/packages/chaintypes/src/paseo-hydration/index.d.ts
index 00d815fb..348d75f8 100644
--- a/packages/chaintypes/src/paseo-hydration/index.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { AccountId32 } from 'dedot/codecs';
 import type {
   HydradxRuntimeRuntimeCall,
@@ -45,26 +45,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameMetadataHashExtensionCheckMetadataHash,
     CumulusPrimitivesStorageWeightReclaimStorageWeightReclaim,
   ];
-}
-
-export interface VersionedPaseoHydrationApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: PaseoHydrationApi
- * @specVersion: 355
+ * @specVersion: 363
  **/
-export interface PaseoHydrationApi {
-  legacy: VersionedPaseoHydrationApi<RpcLegacy>;
-  v2: VersionedPaseoHydrationApi<RpcV2>;
+export interface PaseoHydrationApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/paseo-hydration/json-rpc.d.ts b/packages/chaintypes/src/paseo-hydration/json-rpc.d.ts
index 1ebdb23a..2c54ae0e 100644
--- a/packages/chaintypes/src/paseo-hydration/json-rpc.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_unstable_body'
   | 'archive_unstable_call'
@@ -149,4 +149,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'web3_clientVersion'
   | 'web3_sha3'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/paseo-hydration/query.d.ts b/packages/chaintypes/src/paseo-hydration/query.d.ts
index 5ae5f6bf..84bae39a 100644
--- a/packages/chaintypes/src/paseo-hydration/query.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -135,7 +135,7 @@ import type {
   PalletBroadcastExecutionType,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -146,35 +146,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -182,7 +182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -190,28 +190,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -224,14 +224,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -248,21 +248,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -270,26 +270,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -300,7 +300,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -310,12 +310,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -326,14 +326,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -364,7 +364,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -375,7 +375,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -385,7 +385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -393,7 +393,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -401,12 +401,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -416,18 +416,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiTransactionPayment`'s storage queries
@@ -439,7 +439,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    accountCurrencyMap: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    accountCurrencyMap: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Curated list of currencies which fees can be paid mapped to corresponding fallback price
@@ -447,7 +447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencies: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencies: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      * Asset prices from the spot price provider or the fallback price if the price is not available. Updated at the beginning of every block.
@@ -455,19 +455,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencyPrice: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencyPrice: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    transactionCurrencyOverride: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    transactionCurrencyOverride: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -478,7 +478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -486,28 +486,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -515,12 +515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -532,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -540,19 +540,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -568,7 +568,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -580,7 +579,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -592,7 +591,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -602,7 +601,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -611,7 +610,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -626,7 +624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -639,12 +637,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -655,14 +653,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -672,14 +670,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -687,7 +685,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -697,7 +695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -708,7 +706,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -716,7 +714,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -726,10 +724,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -738,7 +733,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -746,7 +741,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -760,7 +755,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -768,7 +762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -779,7 +773,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -787,7 +781,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<HydradxRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -795,33 +789,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -834,11 +828,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -846,16 +836,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -868,7 +854,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -876,7 +861,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -888,7 +873,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
+    class: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -896,7 +881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -906,7 +891,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, bigint, bigint]) => [] | undefined,
       [AccountId32, bigint, bigint]
     >;
@@ -918,7 +902,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, bigint]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
 
     /**
      * The items in existence and their ownership details.
@@ -926,7 +910,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
+    asset: GenericStorageQuery<(arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
 
     /**
      * Metadata of a collection.
@@ -934,7 +918,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
+    classMetadataOf: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
 
     /**
      * Metadata of an item.
@@ -943,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletUniquesItemMetadata | undefined,
       [bigint, bigint]
     >;
@@ -955,7 +938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [bigint, bigint | undefined, Bytes]
     >;
@@ -967,7 +949,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => [bigint, AccountId32 | undefined] | undefined,
       [bigint, bigint]
     >;
@@ -978,12 +959,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    collectionMaxSupply: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -997,7 +978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -1006,7 +987,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -1015,12 +996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1034,7 +1015,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1047,12 +1027,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1063,7 +1043,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1071,7 +1051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1082,7 +1062,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1090,7 +1070,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1103,12 +1083,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1119,12 +1099,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dispatcher`'s storage queries
@@ -1134,24 +1114,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32> =} callback
      **/
-    aaveManagerAccount: GenericStorageQuery<Rv, () => AccountId32>;
+    aaveManagerAccount: GenericStorageQuery<() => AccountId32>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    extraGas: GenericStorageQuery<Rv, () => bigint>;
+    extraGas: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {Callback<EvmCoreErrorExitReason | undefined> =} callback
      **/
-    lastEvmCallExitReason: GenericStorageQuery<Rv, () => EvmCoreErrorExitReason | undefined>;
+    lastEvmCallExitReason: GenericStorageQuery<() => EvmCoreErrorExitReason | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRegistry`'s storage queries
@@ -1163,14 +1143,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetDetails | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
 
     /**
      * Next available asset id. This is sequential id assigned for each new registered asset.
      *
      * @param {Callback<number> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number>;
+    nextAssetId: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between asset name and asset id.
@@ -1178,7 +1158,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    assetIds: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    assetIds: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Native location of an asset.
@@ -1186,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<HydradxRuntimeXcmAssetLocation | undefined> =} callback
      **/
-    assetLocations: GenericStorageQuery<Rv, (arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
+    assetLocations: GenericStorageQuery<(arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
 
     /**
      * Non-native assets which transfer is banned.
@@ -1194,7 +1174,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    bannedAssets: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    bannedAssets: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Local asset for native location.
@@ -1203,7 +1183,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     locationAssets: GenericStorageQuery<
-      Rv,
       (arg: HydradxRuntimeXcmAssetLocation) => number | undefined,
       HydradxRuntimeXcmAssetLocation
     >;
@@ -1214,12 +1193,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    existentialDepositCounter: GenericStorageQuery<Rv, () => bigint>;
+    existentialDepositCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1231,12 +1210,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {PalletClaimsEthereumAddress} arg
      * @param {Callback<bigint> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
+    claims: GenericStorageQuery<(arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GenesisHistory`'s storage queries
@@ -1246,12 +1225,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGenesisHistoryChain> =} callback
      **/
-    previousChain: GenericStorageQuery<Rv, () => PalletGenesisHistoryChain>;
+    previousChain: GenericStorageQuery<() => PalletGenesisHistoryChain>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorRewards`'s storage queries
@@ -1263,12 +1242,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    collators: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32>, number>;
+    collators: GenericStorageQuery<(arg: number) => Array<AccountId32>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Omnipool`'s storage queries
@@ -1280,14 +1259,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletOmnipoolAssetState | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletOmnipoolAssetState | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletOmnipoolAssetState | undefined, number>;
 
     /**
      * Tradable state of hub asset.
      *
      * @param {Callback<PalletOmnipoolTradability> =} callback
      **/
-    hubAssetTradability: GenericStorageQuery<Rv, () => PalletOmnipoolTradability>;
+    hubAssetTradability: GenericStorageQuery<() => PalletOmnipoolTradability>;
 
     /**
      * LP positions. Maps NFT instance id to corresponding position
@@ -1295,19 +1274,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletOmnipoolPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPause`'s storage queries
@@ -1321,12 +1300,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedTransactions: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedTransactions: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Duster`'s storage queries
@@ -1338,12 +1317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    accountWhitelist: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    accountWhitelist: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s storage queries
@@ -1354,20 +1333,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -1376,7 +1355,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [number, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [number, number, number]
     >;
@@ -1387,7 +1365,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -1395,12 +1373,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+    activeYieldFarm: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s storage queries
@@ -1412,12 +1390,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    omniPositionId: GenericStorageQuery<Rv, (arg: bigint) => bigint | undefined, bigint>;
+    omniPositionId: GenericStorageQuery<(arg: bigint) => bigint | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OTC`'s storage queries
@@ -1428,19 +1406,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextOrderId: GenericStorageQuery<Rv, () => number>;
+    nextOrderId: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletOtcOrder | undefined> =} callback
      **/
-    orders: GenericStorageQuery<Rv, (arg: number) => PalletOtcOrder | undefined, number>;
+    orders: GenericStorageQuery<(arg: number) => PalletOtcOrder | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CircuitBreaker`'s storage queries
@@ -1453,7 +1431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number]> =} callback
      **/
-    tradeVolumeLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number], number>;
+    tradeVolumeLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number], number>;
 
     /**
      * Trade volumes per asset
@@ -1462,7 +1440,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerTradeVolumeLimit | undefined> =} callback
      **/
     allowedTradeVolumeLimitPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerTradeVolumeLimit | undefined,
       number
     >;
@@ -1474,7 +1451,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityAddLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityAddLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Add liquidity volumes per asset
@@ -1483,7 +1460,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedAddLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1493,11 +1469,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletCircuitBreakerLockdownStatus | undefined> =} callback
      **/
-    assetLockdownState: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletCircuitBreakerLockdownStatus | undefined,
-      number
-    >;
+    assetLockdownState: GenericStorageQuery<(arg: number) => PalletCircuitBreakerLockdownStatus | undefined, number>;
 
     /**
      * Liquidity limits of assets for removing liquidity.
@@ -1506,7 +1478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityRemoveLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityRemoveLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Remove liquidity volumes per asset
@@ -1515,7 +1487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedRemoveLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1523,7 +1494,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Router`'s storage queries
@@ -1536,7 +1507,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<HydradxTraitsRouterTrade> | undefined> =} callback
      **/
     routes: GenericStorageQuery<
-      Rv,
       (arg: HydradxTraitsRouterAssetPair) => Array<HydradxTraitsRouterTrade> | undefined,
       HydradxTraitsRouterAssetPair
     >;
@@ -1544,7 +1514,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicFees`'s storage queries
@@ -1557,7 +1527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesFeeEntry | undefined> =} callback
      **/
-    assetFee: GenericStorageQuery<Rv, (arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
+    assetFee: GenericStorageQuery<(arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
 
     /**
      * Stores per-asset fee configuration (Fixed or Dynamic)
@@ -1565,16 +1535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesAssetFeeConfig | undefined> =} callback
      **/
-    assetFeeConfiguration: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletDynamicFeesAssetFeeConfig | undefined,
-      number
-    >;
+    assetFeeConfiguration: GenericStorageQuery<(arg: number) => PalletDynamicFeesAssetFeeConfig | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -1585,7 +1551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingStakingData> =} callback
      **/
-    staking: GenericStorageQuery<Rv, () => PalletStakingStakingData>;
+    staking: GenericStorageQuery<() => PalletStakingStakingData>;
 
     /**
      * User's position state.
@@ -1593,14 +1559,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletStakingPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer.
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * List of position votes.
@@ -1608,7 +1574,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    votes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    votes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * List of processed vote. Used to determine if the vote should be locked in case of voting not in favor.
@@ -1617,7 +1583,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     votesRewarded: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1628,7 +1593,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    positionVotes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    positionVotes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * Legacy storage! - Used to handle democracy processed votes until democracy pallet is fully removed.
@@ -1637,7 +1602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     processedVotes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1647,12 +1611,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sixSecBlocksSince: GenericStorageQuery<Rv, () => number>;
+    sixSecBlocksSince: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Stableswap`'s storage queries
@@ -1664,7 +1628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletStableswapPoolInfo | undefined, number>;
 
     /**
      * Pool peg info.
@@ -1672,7 +1636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolPegInfo | undefined> =} callback
      **/
-    poolPegs: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
+    poolPegs: GenericStorageQuery<(arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
 
     /**
      * Tradability state of pool assets.
@@ -1680,7 +1644,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletStableswapTradability> =} callback
      **/
-    assetTradability: GenericStorageQuery<Rv, (arg: [number, number]) => PalletStableswapTradability, [number, number]>;
+    assetTradability: GenericStorageQuery<(arg: [number, number]) => PalletStableswapTradability, [number, number]>;
 
     /**
      * Temporary pool state storage. Used to save a state of pool in a single block.
@@ -1688,12 +1652,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolSnapshot | undefined> =} callback
      **/
-    poolSnapshots: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
+    poolSnapshots: GenericStorageQuery<(arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bonds`'s storage queries
@@ -1706,7 +1670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, bigint]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    bondIds: GenericStorageQuery<Rv, (arg: [number, bigint]) => number | undefined, [number, bigint]>;
+    bondIds: GenericStorageQuery<(arg: [number, bigint]) => number | undefined, [number, bigint]>;
 
     /**
      * Registered bonds.
@@ -1715,12 +1679,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, bigint] | undefined> =} callback
      **/
-    bonds: GenericStorageQuery<Rv, (arg: number) => [number, bigint] | undefined, number>;
+    bonds: GenericStorageQuery<(arg: number) => [number, bigint] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `LBP`'s storage queries
@@ -1732,7 +1696,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletLbpPool | undefined> =} callback
      **/
-    poolData: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
+    poolData: GenericStorageQuery<(arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
 
     /**
      * Storage used for tracking existing fee collectors
@@ -1741,12 +1705,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<boolean> =} callback
      **/
-    feeCollectorWithAsset: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
+    feeCollectorWithAsset: GenericStorageQuery<(arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYK`'s storage queries
@@ -1758,7 +1722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    shareToken: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    shareToken: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total liquidity in a pool.
@@ -1766,7 +1730,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalLiquidity: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    totalLiquidity: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Asset pair in a pool.
@@ -1774,12 +1738,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    poolAssets: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
+    poolAssets: GenericStorageQuery<(arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referrals`'s storage queries
@@ -1792,7 +1756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    referralCodes: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    referralCodes: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Referral accounts
@@ -1801,7 +1765,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    referralAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    referralAccounts: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * Linked accounts.
@@ -1810,7 +1774,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    linkedAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    linkedAccounts: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Shares of a referral account
@@ -1818,7 +1782,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    referrerShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    referrerShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Shares of a trader account
@@ -1826,14 +1790,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    traderShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    traderShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Total share issuance.
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalShares: GenericStorageQuery<Rv, () => bigint>;
+    totalShares: GenericStorageQuery<() => bigint>;
 
     /**
      * Referer level and total accumulated rewards over time.
@@ -1843,11 +1807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[PalletReferralsLevel, bigint] | undefined> =} callback
      **/
-    referrer: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined,
-      AccountId32
-    >;
+    referrer: GenericStorageQuery<(arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined, AccountId32>;
 
     /**
      * Asset fee distribution rewards information.
@@ -1857,7 +1817,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferralsFeeDistribution | undefined> =} callback
      **/
     assetRewards: GenericStorageQuery<
-      Rv,
       (arg: [number, PalletReferralsLevel]) => PalletReferralsFeeDistribution | undefined,
       [number, PalletReferralsLevel]
     >;
@@ -1869,19 +1828,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pendingConversions: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    pendingConversions: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingConversions: GenericStorageQuery<Rv, () => number>;
+    counterForPendingConversions: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Liquidation`'s storage queries
@@ -1892,12 +1851,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H160> =} callback
      **/
-    borrowingContract: GenericStorageQuery<Rv, () => H160>;
+    borrowingContract: GenericStorageQuery<() => H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `HSM`'s storage queries
@@ -1913,7 +1872,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletHsmCollateralInfo | undefined> =} callback
      **/
-    collaterals: GenericStorageQuery<Rv, (arg: number) => PalletHsmCollateralInfo | undefined, number>;
+    collaterals: GenericStorageQuery<(arg: number) => PalletHsmCollateralInfo | undefined, number>;
 
     /**
      * Amount of Hollar bought with an asset in a single block
@@ -1925,19 +1884,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    hollarAmountReceived: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    hollarAmountReceived: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Address of the flash loan receiver.
      *
      * @param {Callback<H160 | undefined> =} callback
      **/
-    flashMinter: GenericStorageQuery<Rv, () => H160 | undefined>;
+    flashMinter: GenericStorageQuery<() => H160 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1947,12 +1906,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    isTestnet: GenericStorageQuery<Rv, () => boolean>;
+    isTestnet: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tokens`'s storage queries
@@ -1964,7 +1923,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    totalIssuance: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Any liquidity locks of a token type under an account.
@@ -1973,11 +1932,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<Array<OrmlTokensBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>,
-      [AccountId32, number]
-    >;
+    locks: GenericStorageQuery<(arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>, [AccountId32, number]>;
 
     /**
      * The balance of a token type under an account.
@@ -1990,7 +1945,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<OrmlTokensAccountData> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
+    accounts: GenericStorageQuery<(arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
 
     /**
      * Named reserves on some account balances.
@@ -1999,7 +1954,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<OrmlTokensReserveData>> =} callback
      **/
     reserves: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => Array<OrmlTokensReserveData>,
       [AccountId32, number]
     >;
@@ -2007,7 +1961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2021,12 +1975,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<OrmlVestingVestingSchedule>> =} callback
      **/
-    vestingSchedules: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
+    vestingSchedules: GenericStorageQuery<(arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -2037,33 +1991,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    suicided: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    suicided: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMChainId`'s storage queries
@@ -2074,12 +2028,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    chainId: GenericStorageQuery<Rv, () => bigint>;
+    chainId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -2092,7 +2046,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined,
       number
     >;
@@ -2102,40 +2055,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMAccounts`'s storage queries
@@ -2147,7 +2100,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<FixedBytes<12> | undefined> =} callback
      **/
-    accountExtension: GenericStorageQuery<Rv, (arg: H160) => FixedBytes<12> | undefined, H160>;
+    accountExtension: GenericStorageQuery<(arg: H160) => FixedBytes<12> | undefined, H160>;
 
     /**
      * Whitelisted addresses that are allowed to deploy smart contracts.
@@ -2155,7 +2108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    contractDeployer: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    contractDeployer: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Whitelisted contracts that are allowed to manage balances and tokens.
@@ -2163,12 +2116,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    approvedContract: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    approvedContract: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicEvmFee`'s storage queries
@@ -2179,12 +2132,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
+    baseFeePerGas: GenericStorageQuery<() => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYKWarehouseLM`'s storage queries
@@ -2195,20 +2148,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -2217,7 +2170,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [AccountId32, number, number]
     >;
@@ -2228,7 +2180,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData002 | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -2236,16 +2188,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => number | undefined,
-      [AccountId32, number]
-    >;
+    activeYieldFarm: GenericStorageQuery<(arg: [AccountId32Like, number]) => number | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DCA`'s storage queries
@@ -2256,7 +2204,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    scheduleIdSequencer: GenericStorageQuery<Rv, () => number>;
+    scheduleIdSequencer: GenericStorageQuery<() => number>;
 
     /**
      * Storing schedule details
@@ -2264,7 +2212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDcaSchedule | undefined> =} callback
      **/
-    schedules: GenericStorageQuery<Rv, (arg: number) => PalletDcaSchedule | undefined, number>;
+    schedules: GenericStorageQuery<(arg: number) => PalletDcaSchedule | undefined, number>;
 
     /**
      * Storing schedule ownership
@@ -2272,11 +2220,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    scheduleOwnership: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    scheduleOwnership: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * Keep tracking the remaining amounts to spend for DCA schedules
@@ -2284,7 +2228,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    remainingAmounts: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    remainingAmounts: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Keep tracking the retry on error flag for DCA schedules
@@ -2292,7 +2236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    retriesOnError: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    retriesOnError: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Keep tracking the blocknumber when the schedule is planned to be executed
@@ -2300,7 +2244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    scheduleExecutionBlock: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    scheduleExecutionBlock: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Keep tracking of the schedule ids to be executed in the block
@@ -2308,12 +2252,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    scheduleIdsPerBlock: GenericStorageQuery<Rv, (arg: number) => Array<number>, number>;
+    scheduleIdsPerBlock: GenericStorageQuery<(arg: number) => Array<number>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2323,7 +2267,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2331,7 +2275,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -2339,11 +2283,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2354,12 +2294,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -2375,7 +2315,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -2385,7 +2325,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -2399,7 +2338,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -2410,7 +2349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -2419,14 +2358,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -2435,7 +2374,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -2448,7 +2387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -2459,7 +2398,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -2471,7 +2410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -2485,7 +2424,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -2499,7 +2437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -2509,7 +2447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -2520,7 +2458,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -2531,7 +2468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -2540,7 +2477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -2549,7 +2486,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -2558,21 +2495,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -2580,7 +2517,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -2588,7 +2525,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -2596,7 +2533,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -2605,12 +2542,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -2620,12 +2557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -2636,7 +2573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -2644,7 +2581,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -2655,7 +2592,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -2663,7 +2600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -2672,7 +2609,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2684,7 +2620,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2697,7 +2632,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2709,14 +2643,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -2725,7 +2659,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -2737,7 +2670,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -2747,7 +2679,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -2760,7 +2692,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -2772,12 +2704,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV4Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV4Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV4Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -2795,7 +2727,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -2807,7 +2739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -2816,7 +2748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -2828,7 +2759,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2838,14 +2768,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -2854,7 +2784,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2862,7 +2791,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -2875,7 +2804,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -2885,7 +2813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -2894,7 +2822,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -2902,7 +2829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `UnknownTokens`'s storage queries
@@ -2918,7 +2845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     concreteFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, StagingXcmV4Location]) => bigint,
       [StagingXcmV4Location, StagingXcmV4Location]
     >;
@@ -2933,7 +2859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     abstractFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, BytesLike]) => bigint,
       [StagingXcmV4Location, Bytes]
     >;
@@ -2941,7 +2866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -2952,12 +2877,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -2968,7 +2893,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -2979,7 +2904,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -2987,7 +2912,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -2996,7 +2921,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -3005,12 +2930,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -3021,14 +2946,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -3036,7 +2961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -3044,7 +2969,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -3055,7 +2980,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -3063,11 +2988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<HydradxRuntimeOpaqueSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -3076,7 +2997,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -3084,7 +3004,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -3095,7 +3015,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -3104,12 +3024,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -3124,7 +3044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -3133,12 +3053,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ismp`'s storage queries
@@ -3152,7 +3072,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<IsmpConsensusStateCommitment | undefined> =} callback
      **/
     stateCommitments: GenericStorageQuery<
-      Rv,
       (arg: IsmpConsensusStateMachineHeight) => IsmpConsensusStateCommitment | undefined,
       IsmpConsensusStateMachineHeight
     >;
@@ -3163,7 +3082,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<4>} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    consensusStates: GenericStorageQuery<Rv, (arg: FixedBytes<4>) => Bytes | undefined, FixedBytes<4>>;
+    consensusStates: GenericStorageQuery<(arg: FixedBytes<4>) => Bytes | undefined, FixedBytes<4>>;
 
     /**
      * A mapping of consensus state identifier to it's associated consensus client identifier
@@ -3171,7 +3090,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<4>} arg
      * @param {Callback<FixedBytes<4> | undefined> =} callback
      **/
-    consensusStateClient: GenericStorageQuery<Rv, (arg: FixedBytes<4>) => FixedBytes<4> | undefined, FixedBytes<4>>;
+    consensusStateClient: GenericStorageQuery<(arg: FixedBytes<4>) => FixedBytes<4> | undefined, FixedBytes<4>>;
 
     /**
      * A mapping of consensus state identifiers to their unbonding periods
@@ -3179,7 +3098,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<4>} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    unbondingPeriod: GenericStorageQuery<Rv, (arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+    unbondingPeriod: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
 
     /**
      * A mapping of state machine Ids to their challenge periods
@@ -3188,7 +3107,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     challengePeriod: GenericStorageQuery<
-      Rv,
       (arg: IsmpConsensusStateMachineId) => bigint | undefined,
       IsmpConsensusStateMachineId
     >;
@@ -3200,7 +3118,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<4>} arg
      * @param {Callback<boolean> =} callback
      **/
-    frozenConsensusClients: GenericStorageQuery<Rv, (arg: FixedBytes<4>) => boolean, FixedBytes<4>>;
+    frozenConsensusClients: GenericStorageQuery<(arg: FixedBytes<4>) => boolean, FixedBytes<4>>;
 
     /**
      * The latest verified height for a state machine
@@ -3209,7 +3127,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     latestStateMachineHeight: GenericStorageQuery<
-      Rv,
       (arg: IsmpConsensusStateMachineId) => bigint | undefined,
       IsmpConsensusStateMachineId
     >;
@@ -3221,7 +3138,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<4>} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    consensusClientUpdateTime: GenericStorageQuery<Rv, (arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+    consensusClientUpdateTime: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
 
     /**
      * Holds the timestamp at which a state machine height was updated.
@@ -3231,7 +3148,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     stateMachineUpdateTime: GenericStorageQuery<
-      Rv,
       (arg: IsmpConsensusStateMachineHeight) => bigint | undefined,
       IsmpConsensusStateMachineHeight
     >;
@@ -3243,26 +3159,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    responded: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    responded: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * Latest nonce for messages sent from this chain
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The child trie root of messages
      *
      * @param {Callback<H256> =} callback
      **/
-    childTrieRoot: GenericStorageQuery<Rv, () => H256>;
+    childTrieRoot: GenericStorageQuery<() => H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `IsmpParachain`'s storage queries
@@ -3276,14 +3192,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    relayChainStateCommitments: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    relayChainStateCommitments: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Tracks whether we've already seen the `update_parachain_consensus` inherent
      *
      * @param {Callback<boolean | undefined> =} callback
      **/
-    consensusUpdated: GenericStorageQuery<Rv, () => boolean | undefined>;
+    consensusUpdated: GenericStorageQuery<() => boolean | undefined>;
 
     /**
      * List of parachains that this state machine is interested in.
@@ -3291,12 +3207,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    parachains: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hyperbridge`'s storage queries
@@ -3307,12 +3223,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletHyperbridgeVersionedHostParams> =} callback
      **/
-    hostParams: GenericStorageQuery<Rv, () => PalletHyperbridgeVersionedHostParams>;
+    hostParams: GenericStorageQuery<() => PalletHyperbridgeVersionedHostParams>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TokenGateway`'s storage queries
@@ -3325,7 +3241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    supportedAssets: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    supportedAssets: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Assets that originate from this chain
@@ -3333,7 +3249,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<boolean> =} callback
      **/
-    nativeAssets: GenericStorageQuery<Rv, (arg: number) => boolean, number>;
+    nativeAssets: GenericStorageQuery<(arg: number) => boolean, number>;
 
     /**
      * Assets supported by this instance of token gateway
@@ -3342,7 +3258,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    localAssets: GenericStorageQuery<Rv, (arg: H256) => number | undefined, H256>;
+    localAssets: GenericStorageQuery<(arg: H256) => number | undefined, H256>;
 
     /**
      * The decimals used by the EVM counterpart of this asset
@@ -3351,7 +3267,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     precisions: GenericStorageQuery<
-      Rv,
       (arg: [number, IsmpHostStateMachine]) => number | undefined,
       [number, IsmpHostStateMachine]
     >;
@@ -3362,16 +3277,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {IsmpHostStateMachine} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    tokenGatewayAddresses: GenericStorageQuery<
-      Rv,
-      (arg: IsmpHostStateMachine) => Bytes | undefined,
-      IsmpHostStateMachine
-    >;
+    tokenGatewayAddresses: GenericStorageQuery<(arg: IsmpHostStateMachine) => Bytes | undefined, IsmpHostStateMachine>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmaOracle`'s storage queries
@@ -3382,7 +3293,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>> =} callback
      **/
-    accumulator: GenericStorageQuery<Rv, () => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
+    accumulator: GenericStorageQuery<() => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
 
     /**
      * Oracle storage keyed by data source, involved asset ids and the period length of the oracle.
@@ -3393,7 +3304,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletEmaOracleOracleEntry, number] | undefined> =} callback
      **/
     oracles: GenericStorageQuery<
-      Rv,
       (
         arg: [FixedBytes<8>, [number, number], HydradxTraitsOracleOraclePeriod],
       ) => [PalletEmaOracleOracleEntry, number] | undefined,
@@ -3405,12 +3315,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[FixedBytes<8>, [number, number]]>> =} callback
      **/
-    whitelistedAssets: GenericStorageQuery<Rv, () => Array<[FixedBytes<8>, [number, number]]>>;
+    whitelistedAssets: GenericStorageQuery<() => Array<[FixedBytes<8>, [number, number]]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broadcast`'s storage queries
@@ -3421,25 +3331,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    incrementalId: GenericStorageQuery<Rv, () => number>;
+    incrementalId: GenericStorageQuery<() => number>;
 
     /**
      * Execution context to figure out where the trade is originated from
      *
      * @param {Callback<Array<PalletBroadcastExecutionType>> =} callback
      **/
-    executionContext: GenericStorageQuery<Rv, () => Array<PalletBroadcastExecutionType>>;
+    executionContext: GenericStorageQuery<() => Array<PalletBroadcastExecutionType>>;
 
     /**
      * If filled, we overwrite the original swapper. Mainly used in router to not to use temporary trade account
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    swapper: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    swapper: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/runtime.d.ts b/packages/chaintypes/src/paseo-hydration/runtime.d.ts
index c4c4c1a2..de64d398 100644
--- a/packages/chaintypes/src/paseo-hydration/runtime.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -64,7 +64,7 @@ import type {
   CumulusPalletParachainSystemRelayChainState,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -74,7 +74,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -82,7 +82,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -90,12 +90,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -106,7 +106,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -117,7 +117,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -126,12 +126,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -147,7 +147,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FpSelfContainedUncheckedExtrinsic} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: FpSelfContainedUncheckedExtrinsic,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -158,7 +157,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -167,7 +166,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<FpSelfContainedUncheckedExtrinsic>>
     >;
 
@@ -179,14 +177,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -209,7 +206,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: FpSelfContainedUncheckedExtrinsic,
@@ -222,7 +218,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -234,12 +230,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -257,7 +253,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -268,14 +264,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
@@ -288,19 +283,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -315,12 +310,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CurrenciesApi - 0x9af86751b70c112d
@@ -333,7 +328,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} who
      **/
     account: GenericRuntimeApiMethod<
-      Rv,
       (assetId: number, who: AccountId32Like) => Promise<PalletCurrenciesRpcRuntimeApiAccountData>
     >;
 
@@ -343,7 +337,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} who
      **/
     accounts: GenericRuntimeApiMethod<
-      Rv,
       (who: AccountId32Like) => Promise<Array<[number, PalletCurrenciesRpcRuntimeApiAccountData]>>
     >;
 
@@ -353,19 +346,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} asset_id
      * @param {AccountId32Like} who
      **/
-    freeBalance: GenericRuntimeApiMethod<Rv, (assetId: number, who: AccountId32Like) => Promise<bigint>>;
+    freeBalance: GenericRuntimeApiMethod<(assetId: number, who: AccountId32Like) => Promise<bigint>>;
 
     /**
      *
      * @callname: CurrenciesApi_minimum_balance
      * @param {number} asset_id
      **/
-    minimumBalance: GenericRuntimeApiMethod<Rv, (assetId: number) => Promise<bigint>>;
+    minimumBalance: GenericRuntimeApiMethod<(assetId: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -377,12 +370,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -395,7 +388,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -406,7 +398,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: FpSelfContainedUncheckedExtrinsic, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -415,19 +406,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EthereumRuntimeRPCApi - 0x582211f65bb14b89
@@ -438,7 +429,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_chain_id
      **/
-    chainId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    chainId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Returns pallet_evm::Accounts by address.
@@ -446,14 +437,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_basic
      * @param {H160} address
      **/
-    accountBasic: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<EvmBackendBasic>>;
+    accountBasic: GenericRuntimeApiMethod<(address: H160) => Promise<EvmBackendBasic>>;
 
     /**
      * Returns FixedGasPrice::min_gas_price
      *
      * @callname: EthereumRuntimeRPCApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * For a given account address, returns pallet_evm::AccountCodes.
@@ -461,14 +452,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_account_code_at
      * @param {H160} address
      **/
-    accountCodeAt: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    accountCodeAt: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Returns the converted FindAuthor::find_author authority id.
      *
      * @callname: EthereumRuntimeRPCApi_author
      **/
-    author: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    author: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * For a given account address and index, returns pallet_evm::AccountStorages.
@@ -477,7 +468,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} address
      * @param {U256} index
      **/
-    storageAt: GenericRuntimeApiMethod<Rv, (address: H160, index: U256) => Promise<H256>>;
+    storageAt: GenericRuntimeApiMethod<(address: H160, index: U256) => Promise<H256>>;
 
     /**
      *
@@ -494,7 +485,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -523,7 +513,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<[H160, Array<H256>]> | undefined} access_list
      **/
     create: GenericRuntimeApiMethod<
-      Rv,
       (
         from: H160,
         data: BytesLike,
@@ -542,28 +531,27 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_current_block
      **/
-    currentBlock: GenericRuntimeApiMethod<Rv, () => Promise<EthereumBlock | undefined>>;
+    currentBlock: GenericRuntimeApiMethod<() => Promise<EthereumBlock | undefined>>;
 
     /**
      * Return the current receipt.
      *
      * @callname: EthereumRuntimeRPCApi_current_receipts
      **/
-    currentReceipts: GenericRuntimeApiMethod<Rv, () => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
+    currentReceipts: GenericRuntimeApiMethod<() => Promise<Array<EthereumReceiptReceiptV3> | undefined>>;
 
     /**
      * Return the current transaction status.
      *
      * @callname: EthereumRuntimeRPCApi_current_transaction_statuses
      **/
-    currentTransactionStatuses: GenericRuntimeApiMethod<Rv, () => Promise<Array<FpRpcTransactionStatus> | undefined>>;
+    currentTransactionStatuses: GenericRuntimeApiMethod<() => Promise<Array<FpRpcTransactionStatus> | undefined>>;
 
     /**
      *
      * @callname: EthereumRuntimeRPCApi_current_all
      **/
     currentAll: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<
         [
           EthereumBlock | undefined,
@@ -580,7 +568,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     extrinsicFilter: GenericRuntimeApiMethod<
-      Rv,
       (xts: Array<FpSelfContainedUncheckedExtrinsic>) => Promise<Array<EthereumTransactionTransactionV2>>
     >;
 
@@ -589,7 +576,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_elasticity
      **/
-    elasticity: GenericRuntimeApiMethod<Rv, () => Promise<Permill | undefined>>;
+    elasticity: GenericRuntimeApiMethod<() => Promise<Permill | undefined>>;
 
     /**
      * Used to determine if gas limit multiplier for non-transactional calls (eth_call/estimateGas)
@@ -597,7 +584,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: EthereumRuntimeRPCApi_gas_limit_multiplier_support
      **/
-    gasLimitMultiplierSupport: GenericRuntimeApiMethod<Rv, () => Promise<[]>>;
+    gasLimitMultiplierSupport: GenericRuntimeApiMethod<() => Promise<[]>>;
 
     /**
      * Return the pending block.
@@ -606,7 +593,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {Array<FpSelfContainedUncheckedExtrinsic>} xts
      **/
     pendingBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         xts: Array<FpSelfContainedUncheckedExtrinsic>,
       ) => Promise<[EthereumBlock | undefined, Array<FpRpcTransactionStatus> | undefined]>
@@ -622,12 +608,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EthereumRuntimeRPCApi_initialize_pending_block
      * @param {Header} header
      **/
-    initializePendingBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    initializePendingBlock: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ConvertTransactionRuntimeApi - 0xe65b00e46cedd0aa
@@ -639,14 +625,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     convertTransaction: GenericRuntimeApiMethod<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => Promise<FpSelfContainedUncheckedExtrinsic>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: EvmAccountsApi - 0x0bb67a52fcd040ff
@@ -658,7 +643,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_evm_address
      * @param {AccountId32Like} account_id
      **/
-    evmAddress: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<H160>>;
+    evmAddress: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<H160>>;
 
     /**
      * Return the Substrate address bound to the EVM account. If not bound, returns `None`.
@@ -666,7 +651,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_bound_account_id
      * @param {H160} evm_address
      **/
-    boundAccountId: GenericRuntimeApiMethod<Rv, (evmAddress: H160) => Promise<AccountId32 | undefined>>;
+    boundAccountId: GenericRuntimeApiMethod<(evmAddress: H160) => Promise<AccountId32 | undefined>>;
 
     /**
      * Get the Substrate address from the EVM address.
@@ -675,12 +660,30 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: EvmAccountsApi_account_id
      * @param {H160} evm_address
      **/
-    accountId: GenericRuntimeApiMethod<Rv, (evmAddress: H160) => Promise<AccountId32>>;
+    accountId: GenericRuntimeApiMethod<(evmAddress: H160) => Promise<AccountId32>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: DusterApi - 0x34a3d488166b5a55
+   **/
+  dusterApi: {
+    /**
+     * Check if an account is whitelisted (protected from dusting).
+     * Returns true if the account is whitelisted, false otherwise.
+     *
+     * @callname: DusterApi_is_whitelisted
+     * @param {AccountId32Like} account
+     **/
+    isWhitelisted: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<boolean>>;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Erc20MappingApi - 0x542334fe4fd7cada
@@ -692,7 +695,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Erc20MappingApi_asset_address
      * @param {number} asset_id
      **/
-    assetAddress: GenericRuntimeApiMethod<Rv, (assetId: number) => Promise<H160>>;
+    assetAddress: GenericRuntimeApiMethod<(assetId: number) => Promise<H160>>;
 
     /**
      * Get the asset id corresponding to EVM address. If not found, returns `None`.
@@ -700,12 +703,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Erc20MappingApi_address_to_asset
      * @param {H160} address
      **/
-    addressToAsset: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number | undefined>>;
+    addressToAsset: GenericRuntimeApiMethod<(address: H160) => Promise<number | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -722,7 +725,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -737,7 +739,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -754,7 +755,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -773,7 +773,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -783,7 +782,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -805,12 +804,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -824,7 +823,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: HydradxRuntimeOriginCaller,
         call: HydradxRuntimeRuntimeCallLike,
@@ -839,7 +837,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -849,7 +846,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -862,14 +859,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ChainlinkAdapterApi - 0x2b5f5bcd2460e4f0
@@ -884,7 +880,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<8>} source
      **/
     encodeOracleAddress: GenericRuntimeApiMethod<
-      Rv,
       (
         assetIdA: number,
         assetIdB: number,
@@ -899,14 +894,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H160} oracle_address
      **/
     decodeOracleAddress: GenericRuntimeApiMethod<
-      Rv,
       (oracleAddress: H160) => Promise<[number, number, HydradxTraitsOracleOraclePeriod, FixedBytes<8>] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AaveTradeExecutor - 0xa2b2b484fcb86943
@@ -916,7 +910,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AaveTradeExecutor_pairs
      **/
-    pairs: GenericRuntimeApiMethod<Rv, () => Promise<Array<[number, number]>>>;
+    pairs: GenericRuntimeApiMethod<() => Promise<Array<[number, number]>>>;
 
     /**
      *
@@ -924,7 +918,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} asset_in
      * @param {number} asset_out
      **/
-    liquidityDepth: GenericRuntimeApiMethod<Rv, (assetIn: number, assetOut: number) => Promise<bigint | undefined>>;
+    liquidityDepth: GenericRuntimeApiMethod<(assetIn: number, assetOut: number) => Promise<bigint | undefined>>;
 
     /**
      *
@@ -933,7 +927,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} atoken
      **/
     pool: GenericRuntimeApiMethod<
-      Rv,
       (reserve: number, atoken: number) => Promise<HydradxRuntimeEvmAaveTradeExecutorPoolData>
     >;
 
@@ -941,12 +934,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AaveTradeExecutor_pools
      **/
-    pools: GenericRuntimeApiMethod<Rv, () => Promise<Array<HydradxRuntimeEvmAaveTradeExecutorPoolData>>>;
+    pools: GenericRuntimeApiMethod<() => Promise<Array<HydradxRuntimeEvmAaveTradeExecutorPoolData>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: IsmpRuntimeApi - 0x0ebc8fd84ae20ada
@@ -957,21 +950,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: IsmpRuntimeApi_host_state_machine
      **/
-    hostStateMachine: GenericRuntimeApiMethod<Rv, () => Promise<IsmpHostStateMachine>>;
+    hostStateMachine: GenericRuntimeApiMethod<() => Promise<IsmpHostStateMachine>>;
 
     /**
      * Fetch all ISMP events
      *
      * @callname: IsmpRuntimeApi_block_events
      **/
-    blockEvents: GenericRuntimeApiMethod<Rv, () => Promise<Array<IsmpEventsEvent>>>;
+    blockEvents: GenericRuntimeApiMethod<() => Promise<Array<IsmpEventsEvent>>>;
 
     /**
      * Fetch all ISMP events and their extrinsic metadata
      *
      * @callname: IsmpRuntimeApi_block_events_with_metadata
      **/
-    blockEventsWithMetadata: GenericRuntimeApiMethod<Rv, () => Promise<Array<[IsmpEventsEvent, number | undefined]>>>;
+    blockEventsWithMetadata: GenericRuntimeApiMethod<() => Promise<Array<[IsmpEventsEvent, number | undefined]>>>;
 
     /**
      * Return the scale encoded consensus state
@@ -979,7 +972,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: IsmpRuntimeApi_consensus_state
      * @param {FixedBytes<4>} id
      **/
-    consensusState: GenericRuntimeApiMethod<Rv, (id: FixedBytes<4>) => Promise<Bytes | undefined>>;
+    consensusState: GenericRuntimeApiMethod<(id: FixedBytes<4>) => Promise<Bytes | undefined>>;
 
     /**
      * Return the timestamp this client was last updated in seconds
@@ -988,7 +981,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {IsmpConsensusStateMachineHeight} id
      **/
     stateMachineUpdateTime: GenericRuntimeApiMethod<
-      Rv,
       (id: IsmpConsensusStateMachineHeight) => Promise<bigint | undefined>
     >;
 
@@ -998,7 +990,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: IsmpRuntimeApi_challenge_period
      * @param {IsmpConsensusStateMachineId} id
      **/
-    challengePeriod: GenericRuntimeApiMethod<Rv, (id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>>;
+    challengePeriod: GenericRuntimeApiMethod<(id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>>;
 
     /**
      * Return the latest height of the state machine
@@ -1006,10 +998,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: IsmpRuntimeApi_latest_state_machine_height
      * @param {IsmpConsensusStateMachineId} id
      **/
-    latestStateMachineHeight: GenericRuntimeApiMethod<
-      Rv,
-      (id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>
-    >;
+    latestStateMachineHeight: GenericRuntimeApiMethod<(id: IsmpConsensusStateMachineId) => Promise<bigint | undefined>>;
 
     /**
      * Fetch the requests for the given commitments.
@@ -1017,7 +1006,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: IsmpRuntimeApi_requests
      * @param {Array<H256>} request_commitments
      **/
-    requests: GenericRuntimeApiMethod<Rv, (requestCommitments: Array<H256>) => Promise<Array<IsmpRouterRequest>>>;
+    requests: GenericRuntimeApiMethod<(requestCommitments: Array<H256>) => Promise<Array<IsmpRouterRequest>>>;
 
     /**
      * Fetch the responses for the given commitments.
@@ -1025,12 +1014,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: IsmpRuntimeApi_responses
      * @param {Array<H256>} response_commitments
      **/
-    responses: GenericRuntimeApiMethod<Rv, (responseCommitments: Array<H256>) => Promise<Array<IsmpRouterResponse>>>;
+    responses: GenericRuntimeApiMethod<(responseCommitments: Array<H256>) => Promise<Array<IsmpRouterResponse>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: IsmpParachainApi - 0x5d1df2fe7d4f6bc8
@@ -1041,19 +1030,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: IsmpParachainApi_para_ids
      **/
-    paraIds: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    paraIds: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Return the current relay chain state.
      *
      * @callname: IsmpParachainApi_current_relay_chain_state
      **/
-    currentRelayChainState: GenericRuntimeApiMethod<Rv, () => Promise<CumulusPalletParachainSystemRelayChainState>>;
+    currentRelayChainState: GenericRuntimeApiMethod<() => Promise<CumulusPalletParachainSystemRelayChainState>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1073,7 +1062,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1094,7 +1083,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1104,11 +1093,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/tx.d.ts b/packages/chaintypes/src/paseo-hydration/tx.d.ts
index 7fbef5c2..5bb731ea 100644
--- a/packages/chaintypes/src/paseo-hydration/tx.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   AccountId32Like,
@@ -87,19 +85,23 @@ import type {
   PalletTokenGatewayAssetRegistration,
   TokenGatewayPrimitivesGatewayAssetUpdate,
   PalletTokenGatewayPrecisionUpdate,
+  PalletIsmpOracleTestGetParams,
+  PalletIsmpOracleTestPostParams,
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = HydradxRuntimeRuntimeCallLike,
-> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<AccountId32Like, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<HydradxRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -112,16 +114,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -131,16 +132,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -150,16 +150,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -172,16 +171,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -191,16 +189,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -210,16 +207,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -233,19 +229,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -255,16 +250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -277,16 +271,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -303,16 +296,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -330,23 +322,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -376,23 +367,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -411,19 +401,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -436,20 +425,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -465,19 +453,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -502,19 +489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -527,19 +513,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -556,16 +541,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -578,19 +562,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: AccountId32Like; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -605,19 +588,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -634,26 +616,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiTransactionPayment`'s transaction calls
@@ -677,16 +658,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     setCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'SetCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -703,19 +683,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} price
      **/
     addCurrency: GenericTxCall<
-      Rv,
       (
         currency: number,
         price: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'AddCurrency';
             params: { currency: number; price: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -730,16 +709,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currency
      **/
     removeCurrency: GenericTxCall<
-      Rv,
       (currency: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'RemoveCurrency';
             params: { currency: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -753,16 +731,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} accountId
      **/
     resetPaymentCurrency: GenericTxCall<
-      Rv,
       (accountId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
             name: 'ResetPaymentCurrency';
             params: { accountId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -783,7 +760,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} s
      **/
     dispatchPermit: GenericTxCall<
-      Rv,
       (
         from: H160,
         to: H160,
@@ -795,7 +771,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         r: H256,
         s: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiTransactionPayment';
           palletCall: {
@@ -812,14 +787,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               s: H256;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -848,19 +824,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -890,16 +865,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -937,21 +911,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: [],
         amount: bigint,
         beneficiary: AccountId32Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Spend';
             params: { assetKind: []; amount: bigint; beneficiary: AccountId32Like; validFrom: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -979,16 +952,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1016,16 +988,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1050,23 +1021,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1095,16 +1065,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1127,19 +1096,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1161,16 +1129,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1186,19 +1153,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: HydradxRuntimeOriginCaller,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: HydradxRuntimeOriginCaller; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1220,16 +1186,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<HydradxRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<HydradxRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1245,26 +1210,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: HydradxRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: HydradxRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -1279,16 +1243,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1303,16 +1266,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1325,16 +1287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1346,16 +1307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1367,23 +1327,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -1401,16 +1360,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1429,16 +1387,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1456,16 +1413,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1481,15 +1437,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1515,19 +1470,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1546,16 +1500,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1572,19 +1525,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1601,19 +1553,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1630,19 +1581,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1669,21 +1619,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: AccountId32Like,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: AccountId32Like; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1704,16 +1653,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1730,19 +1678,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1756,19 +1703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: AccountId32Like,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: AccountId32Like; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1784,16 +1730,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1811,15 +1756,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1834,20 +1778,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: AccountId32Like,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: AccountId32Like; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1857,16 +1800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (authority: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { authority: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1886,20 +1828,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetUsernameFor';
             params: { who: AccountId32Like; username: BytesLike; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1910,16 +1851,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1931,16 +1871,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1950,16 +1889,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1970,23 +1908,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeDanglingUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveDanglingUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Democracy`'s transaction calls
@@ -2007,19 +1944,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     propose: GenericTxCall<
-      Rv,
       (
         proposal: FrameSupportPreimagesBounded,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Propose';
             params: { proposal: FrameSupportPreimagesBounded; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2034,16 +1970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposal
      **/
     second: GenericTxCall<
-      Rv,
       (proposal: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Second';
             params: { proposal: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2060,19 +1995,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDemocracyVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         refIndex: number,
         vote: PalletDemocracyVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Vote';
             params: { refIndex: number; vote: PalletDemocracyVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2089,16 +2023,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     emergencyCancel: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'EmergencyCancel';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2113,16 +2046,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalPropose: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalPropose';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2142,16 +2074,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeMajority: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeMajority';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2171,16 +2102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeDefault: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeDefault';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2207,20 +2137,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     fastTrack: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         votingPeriod: number,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'FastTrack';
             params: { proposalHash: H256; votingPeriod: number; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2238,16 +2167,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     vetoExternal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'VetoExternal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2263,16 +2191,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     cancelReferendum: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelReferendum';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2303,20 +2230,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         to: AccountId32Like,
         conviction: PalletDemocracyConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Delegate';
             params: { to: AccountId32Like; conviction: PalletDemocracyConviction; balance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2336,15 +2262,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     undelegate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Undelegate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2357,15 +2282,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPublicProposals: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ClearPublicProposals';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2381,16 +2305,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (target: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Unlock';
             params: { target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2426,16 +2349,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveVote';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2460,19 +2382,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2497,19 +2418,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeRefIndex
      **/
     blacklist: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         maybeRefIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Blacklist';
             params: { proposalHash: H256; maybeRefIndex: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2525,16 +2445,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} propIndex
      **/
     cancelProposal: GenericTxCall<
-      Rv,
       (propIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelProposal';
             params: { propIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2559,19 +2478,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         owner: PalletDemocracyMetadataOwner,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'SetMetadata';
             params: { owner: PalletDemocracyMetadataOwner; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2596,26 +2514,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     forceRemoveVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ForceRemoveVote';
             params: { target: AccountId32Like; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommittee`'s transaction calls
@@ -2652,20 +2569,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2684,19 +2600,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: HydradxRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Execute';
             params: { proposal: HydradxRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2721,20 +2636,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: HydradxRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: HydradxRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2754,20 +2668,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2786,16 +2699,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2831,14 +2743,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
@@ -2850,14 +2760,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2879,13 +2790,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         forceProxyType: HydradxRuntimeSystemProxyType | undefined,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2896,7 +2805,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2916,20 +2826,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: AccountId32Like; proxyType: HydradxRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2947,20 +2856,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: AccountId32Like; proxyType: HydradxRuntimeSystemProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2974,15 +2882,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3011,20 +2918,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: HydradxRuntimeSystemProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: HydradxRuntimeSystemProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3053,7 +2959,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: AccountId32Like,
         proxyType: HydradxRuntimeSystemProxyType,
@@ -3061,7 +2966,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3074,7 +2978,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3099,19 +3004,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3131,19 +3035,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3163,19 +3066,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: AccountId32Like; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3198,14 +3100,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: AccountId32Like,
         real: AccountId32Like,
         forceProxyType: HydradxRuntimeSystemProxyType | undefined,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3217,14 +3117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3248,19 +3149,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3312,7 +3212,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3320,7 +3219,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: HydradxRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3333,7 +3231,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3376,7 +3275,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3384,7 +3282,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3397,7 +3294,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3430,14 +3328,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3449,14 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -3484,19 +3381,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         admin: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: bigint; admin: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3524,20 +3420,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: bigint; owner: AccountId32Like; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3562,19 +3457,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: bigint; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3596,20 +3490,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         owner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: bigint; item: bigint; owner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3635,20 +3528,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         checkOwner: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: bigint; item: bigint; checkOwner: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3676,20 +3568,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: bigint; item: bigint; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3716,19 +3607,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<bigint>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         items: Array<bigint>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: bigint; items: Array<bigint> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3748,19 +3638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3780,19 +3669,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3810,16 +3698,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3837,16 +3724,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3867,19 +3753,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         newOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: bigint; newOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3903,21 +3788,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         issuer: AccountId32Like,
         admin: AccountId32Like,
         freezer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetTeam';
             params: { collection: bigint; issuer: AccountId32Like; admin: AccountId32Like; freezer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3942,20 +3826,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         delegate: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: bigint; item: bigint; delegate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3982,20 +3865,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         maybeCheckDelegate: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: bigint; item: bigint; maybeCheckDelegate: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4026,7 +3908,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         owner: AccountId32Like,
@@ -4036,7 +3917,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -4051,7 +3931,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4080,21 +3961,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4119,20 +3999,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maybeItem: bigint | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: bigint; maybeItem: bigint | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4161,21 +4040,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: bigint; item: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4198,19 +4076,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: bigint; item: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4237,20 +4114,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: bigint; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4271,16 +4147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4299,16 +4174,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: bigint | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4329,19 +4203,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: bigint; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4364,14 +4237,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         price: bigint | undefined,
         whitelistedBuyer: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -4383,7 +4254,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4403,27 +4275,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: bigint,
         item: bigint,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: bigint; item: bigint; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -4437,16 +4308,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4478,13 +4348,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -4495,7 +4363,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4509,19 +4378,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4538,20 +4406,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4561,16 +4428,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4589,26 +4455,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -4629,19 +4494,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4676,14 +4540,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: AccountId32Like,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -4695,7 +4557,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4718,16 +4581,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4746,19 +4608,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4797,19 +4658,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4836,20 +4696,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: AccountId32Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4874,27 +4733,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     forceRemoveVote: GenericTxCall<
-      Rv,
       (
         target: AccountId32Like,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'ForceRemoveVote';
             params: { target: AccountId32Like; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -4916,13 +4774,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: HydradxRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -4933,7 +4789,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4950,16 +4807,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4975,16 +4831,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4999,16 +4854,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5023,16 +4877,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5045,16 +4898,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5072,16 +4924,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5097,16 +4948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5123,26 +4973,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -5153,16 +5002,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5171,16 +5019,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5191,20 +5038,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5213,23 +5059,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Dispatcher`'s transaction calls
@@ -5240,16 +5085,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAsTreasury: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchAsTreasury';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5258,16 +5102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchAsAaveManager: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchAsAaveManager';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5282,16 +5125,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     noteAaveManager: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'NoteAaveManager';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5305,19 +5147,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} extraGas
      **/
     dispatchWithExtraGas: GenericTxCall<
-      Rv,
       (
         call: HydradxRuntimeRuntimeCallLike,
         extraGas: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchWithExtraGas';
             params: { call: HydradxRuntimeRuntimeCallLike; extraGas: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5335,23 +5176,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     dispatchEvmCall: GenericTxCall<
-      Rv,
       (call: HydradxRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dispatcher';
           palletCall: {
             name: 'DispatchEvmCall';
             params: { call: HydradxRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRegistry`'s transaction calls
@@ -5382,7 +5222,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isSufficient
      **/
     register: GenericTxCall<
-      Rv,
       (
         assetId: number | undefined,
         name: BytesLike | undefined,
@@ -5394,7 +5233,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         xcmRateLimit: bigint | undefined,
         isSufficient: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -5411,7 +5249,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isSufficient: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5438,7 +5277,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeXcmAssetLocation | undefined} location
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetId: number,
         name: BytesLike | undefined,
@@ -5450,7 +5288,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number | undefined,
         location: HydradxRuntimeXcmAssetLocation | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
@@ -5467,7 +5304,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               location: HydradxRuntimeXcmAssetLocation | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5476,16 +5314,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeXcmAssetLocation} location
      **/
     registerExternal: GenericTxCall<
-      Rv,
       (location: HydradxRuntimeXcmAssetLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'RegisterExternal';
             params: { location: HydradxRuntimeXcmAssetLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5494,16 +5331,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     banAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'BanAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5512,23 +5348,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     unbanAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRegistry';
           palletCall: {
             name: 'UnbanAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -5540,23 +5375,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (ethereumSignature: PalletClaimsEcdsaSignature) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { ethereumSignature: PalletClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `GenesisHistory`'s transaction calls
@@ -5565,7 +5399,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Omnipool`'s transaction calls
@@ -5595,21 +5429,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} positionOwner
      **/
     addToken: GenericTxCall<
-      Rv,
       (
         asset: number,
         initialPrice: FixedU128,
         weightCap: Permill,
         positionOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddToken';
             params: { asset: number; initialPrice: FixedU128; weightCap: Permill; positionOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5639,19 +5472,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddLiquidity';
             params: { asset: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5685,20 +5517,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minSharesLimit
      **/
     addLiquidityWithLimit: GenericTxCall<
-      Rv,
       (
         asset: number,
         amount: bigint,
         minSharesLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'AddLiquidityWithLimit';
             params: { asset: number; amount: bigint; minSharesLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5727,19 +5558,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { positionId: bigint; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5772,20 +5602,60 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minLimit
      **/
     removeLiquidityWithLimit: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
         minLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveLiquidityWithLimit';
             params: { positionId: bigint; amount: bigint; minLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Remove all liquidity from position
+     *
+     * Limit protection is applied.
+     *
+     * `remove_all_liquidity` removes all shares amount from given PositionId (NFT instance).
+     *
+     * Asset's tradable state must contain REMOVE_LIQUIDITY flag, otherwise `NotAllowed` error is returned.
+     *
+     * if all shares from given position are removed, position is destroyed and NFT is burned.
+     *
+     * Remove all liquidity fails if price difference between spot price and oracle price is higher than allowed by `PriceBarrier`.
+     *
+     * Dynamic withdrawal fee is applied if withdrawal is not safe. It is calculated using spot price and external price oracle.
+     * Withdrawal is considered safe when trading is disabled.
+     *
+     * Parameters:
+     * - `position_id`: The identifier of position which liquidity is entirely removed from.
+     *
+     * Emits `LiquidityRemoved` event when successful.
+     *
+     *
+     * @param {bigint} positionId
+     * @param {bigint} minLimit
+     **/
+    removeAllLiquidity: GenericTxCall<
+      (
+        positionId: bigint,
+        minLimit: bigint,
+      ) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'Omnipool';
+          palletCall: {
+            name: 'RemoveAllLiquidity';
+            params: { positionId: bigint; minLimit: bigint };
+          };
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5801,16 +5671,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     sacrificePosition: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SacrificePosition';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5839,21 +5708,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBuyAmount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amount: bigint,
         minBuyAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; minBuyAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5882,21 +5750,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxSellAmount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
         amount: bigint,
         maxSellAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxSellAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5914,19 +5781,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletOmnipoolTradability} state
      **/
     setAssetTradableState: GenericTxCall<
-      Rv,
       (
         assetId: number,
         state: PalletOmnipoolTradability,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SetAssetTradableState';
             params: { assetId: number; state: PalletOmnipoolTradability };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5946,20 +5812,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} recipient
      **/
     refundRefusedAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         recipient: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RefundRefusedAsset';
             params: { assetId: number; amount: bigint; recipient: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5977,19 +5842,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} cap
      **/
     setAssetWeightCap: GenericTxCall<
-      Rv,
       (
         assetId: number,
         cap: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'SetAssetWeightCap';
             params: { assetId: number; cap: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6012,21 +5876,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     withdrawProtocolLiquidity: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         price: [bigint, bigint],
         dest: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'WithdrawProtocolLiquidity';
             params: { assetId: number; amount: bigint; price: [bigint, bigint]; dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6047,26 +5910,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     removeToken: GenericTxCall<
-      Rv,
       (
         assetId: number,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Omnipool';
           palletCall: {
             name: 'RemoveToken';
             params: { assetId: number; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TransactionPause`'s transaction calls
@@ -6078,19 +5940,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     pauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'PauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6100,26 +5961,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} functionName
      **/
     unpauseTransaction: GenericTxCall<
-      Rv,
       (
         palletName: BytesLike,
         functionName: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionPause';
           palletCall: {
             name: 'UnpauseTransaction';
             params: { palletName: BytesLike; functionName: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Duster`'s transaction calls
@@ -6142,19 +6002,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} currencyId
      **/
     dustAccount: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         currencyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'DustAccount';
             params: { account: AccountId32Like; currencyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6169,16 +6028,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     whitelistAccount: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'WhitelistAccount';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6191,23 +6049,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} account
      **/
     removeFromWhitelist: GenericTxCall<
-      Rv,
       (account: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Duster';
           palletCall: {
             name: 'RemoveFromWhitelist';
             params: { account: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s transaction calls
@@ -6216,7 +6073,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s transaction calls
@@ -6262,7 +6119,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} lrnaPriceAdjustment
      **/
     createGlobalFarm: GenericTxCall<
-      Rv,
       (
         totalRewards: bigint,
         plannedYieldingPeriods: number,
@@ -6273,7 +6129,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minDeposit: bigint,
         lrnaPriceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6289,7 +6144,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lrnaPriceAdjustment: FixedU128;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6311,16 +6167,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} globalFarmId
      **/
     terminateGlobalFarm: GenericTxCall<
-      Rv,
       (globalFarmId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'TerminateGlobalFarm';
             params: { globalFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6350,14 +6205,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletLiquidityMiningLoyaltyCurve | undefined} loyaltyCurve
      **/
     createYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
         multiplier: FixedU128,
         loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6369,7 +6222,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6392,20 +6246,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     updateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'UpdateYieldFarm';
             params: { globalFarmId: number; assetId: number; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6431,19 +6284,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     stopYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'StopYieldFarm';
             params: { globalFarmId: number; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6474,21 +6326,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     resumeYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetId: number,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ResumeYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetId: number; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6519,20 +6370,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     terminateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'TerminateYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6557,20 +6407,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     depositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         positionId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'DepositShares';
             params: { globalFarmId: number; yieldFarmId: number; positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6596,20 +6445,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} depositId
      **/
     redepositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         depositId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'RedepositShares';
             params: { globalFarmId: number; yieldFarmId: number; depositId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6631,19 +6479,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     claimRewards: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ClaimRewards';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6673,19 +6520,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     withdrawShares: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'WithdrawShares';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6711,14 +6557,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minDeposit
      **/
     updateGlobalFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         plannedYieldingPeriods: number,
         yieldPerPeriod: Perquintill,
         minDeposit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6730,7 +6574,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               minDeposit: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6749,19 +6594,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     joinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         positionId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'JoinFarms';
             params: { farmEntries: Array<[number, number]>; positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6784,14 +6628,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} minSharesLimit
      **/
     addLiquidityAndJoinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         asset: number,
         amount: bigint,
         minSharesLimit: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6803,7 +6645,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               minSharesLimit: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6828,19 +6671,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} yieldFarmIds
      **/
     exitFarms: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmIds: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
             name: 'ExitFarms';
             params: { depositId: bigint; yieldFarmIds: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6867,13 +6709,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, number]> | undefined} farmEntries
      **/
     addLiquidityStableswapOmnipoolAndJoinFarms: GenericTxCall<
-      Rv,
       (
         stablePoolId: number,
         stableAssetAmounts: Array<HydradxTraitsStableswapAssetAmount>,
         farmEntries: Array<[number, number]> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OmnipoolLiquidityMining';
           palletCall: {
@@ -6884,14 +6724,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               farmEntries: Array<[number, number]> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OTC`'s transaction calls
@@ -6924,7 +6765,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} partiallyFillable
      **/
     placeOrder: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -6932,7 +6772,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountOut: bigint,
         partiallyFillable: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
@@ -6945,7 +6784,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               partiallyFillable: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6971,19 +6811,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountIn
      **/
     partialFillOrder: GenericTxCall<
-      Rv,
       (
         orderId: number,
         amountIn: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'PartialFillOrder';
             params: { orderId: number; amountIn: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7000,16 +6839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} orderId
      **/
     fillOrder: GenericTxCall<
-      Rv,
       (orderId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'FillOrder';
             params: { orderId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7029,23 +6867,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} orderId
      **/
     cancelOrder: GenericTxCall<
-      Rv,
       (orderId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Otc';
           palletCall: {
             name: 'CancelOrder';
             params: { orderId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CircuitBreaker`'s transaction calls
@@ -7066,19 +6903,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} tradeVolumeLimit
      **/
     setTradeVolumeLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         tradeVolumeLimit: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetTradeVolumeLimit';
             params: { assetId: number; tradeVolumeLimit: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7097,19 +6933,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number] | undefined} liquidityLimit
      **/
     setAddLiquidityLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         liquidityLimit: [number, number] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetAddLiquidityLimit';
             params: { assetId: number; liquidityLimit: [number, number] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7128,19 +6963,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number] | undefined} liquidityLimit
      **/
     setRemoveLiquidityLimit: GenericTxCall<
-      Rv,
       (
         assetId: number,
         liquidityLimit: [number, number] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'SetRemoveLiquidityLimit';
             params: { assetId: number; liquidityLimit: [number, number] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7160,19 +6994,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} until
      **/
     lockdownAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         until: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'LockdownAsset';
             params: { assetId: number; until: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7191,16 +7024,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     forceLiftLockdown: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'ForceLiftLockdown';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7224,26 +7056,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     releaseDeposit: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CircuitBreaker';
           palletCall: {
             name: 'ReleaseDeposit';
             params: { who: AccountId32Like; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Router`'s transaction calls
@@ -7271,7 +7102,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7279,7 +7109,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7292,7 +7121,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7318,7 +7148,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -7326,7 +7155,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxAmountIn: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
@@ -7339,7 +7167,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7370,19 +7199,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     setRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SetRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7406,19 +7234,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} newRoute
      **/
     forceInsertRoute: GenericTxCall<
-      Rv,
       (
         assetPair: HydradxTraitsRouterAssetPair,
         newRoute: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'ForceInsertRoute';
             params: { assetPair: HydradxTraitsRouterAssetPair; newRoute: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7444,28 +7271,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     sellAll: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         minAmountOut: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Router';
           palletCall: {
             name: 'SellAll';
             params: { assetIn: number; assetOut: number; minAmountOut: bigint; route: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DynamicFees`'s transaction calls
@@ -7485,19 +7311,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDynamicFeesAssetFeeConfig} config
      **/
     setAssetFee: GenericTxCall<
-      Rv,
       (
         assetId: number,
         config: PalletDynamicFeesAssetFeeConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DynamicFees';
           palletCall: {
             name: 'SetAssetFee';
             params: { assetId: number; config: PalletDynamicFeesAssetFeeConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7514,23 +7339,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     removeAssetFee: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'DynamicFees';
           palletCall: {
             name: 'RemoveAssetFee';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -7547,15 +7371,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     initializeStaking: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'InitializeStaking';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7578,16 +7401,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     stake: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Stake';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7613,19 +7435,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     increaseStake: GenericTxCall<
-      Rv,
       (
         positionId: bigint,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseStake';
             params: { positionId: bigint; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7648,16 +7469,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     claim: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Claim';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7678,23 +7498,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} positionId
      **/
     unstake: GenericTxCall<
-      Rv,
       (positionId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unstake';
             params: { positionId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Stableswap`'s transaction calls
@@ -7722,21 +7541,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} fee
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         shareAsset: number,
         assets: Array<number>,
         amplification: number,
         fee: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'CreatePool';
             params: { shareAsset: number; assets: Array<number>; amplification: number; fee: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7756,19 +7574,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Permill} fee
      **/
     updatePoolFee: GenericTxCall<
-      Rv,
       (
         poolId: number,
         fee: Permill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdatePoolFee';
             params: { poolId: number; fee: Permill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7790,63 +7607,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} endBlock
      **/
     updateAmplification: GenericTxCall<
-      Rv,
       (
         poolId: number,
         finalAmplification: number,
         startBlock: number,
         endBlock: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdateAmplification';
             params: { poolId: number; finalAmplification: number; startBlock: number; endBlock: number };
           };
-        }
-      >
-    >;
-
-    /**
-     * Add liquidity to selected pool.
-     *
-     * Use `add_assets_liquidity` instead.
-     * This extrinsics will be removed in the future.
-     *
-     * First call of `add_liquidity` must provide "initial liquidity" of all assets.
-     *
-     * If there is liquidity already in the pool, LP can provide liquidity of any number of pool assets.
-     *
-     * LP must have sufficient amount of each asset.
-     *
-     * Origin is given corresponding amount of shares.
-     *
-     * Parameters:
-     * - `origin`: liquidity provider
-     * - `pool_id`: Pool Id
-     * - `assets`: asset id and liquidity amount provided
-     *
-     * Emits `LiquidityAdded` event when successful.
-     * Emits `pallet_broadcast::Swapped` event when successful.
-     *
-     * @param {number} poolId
-     * @param {Array<HydradxTraitsStableswapAssetAmount>} assets
-     **/
-    addLiquidity: GenericTxCall<
-      Rv,
-      (
-        poolId: number,
-        assets: Array<HydradxTraitsStableswapAssetAmount>,
-      ) => ChainSubmittableExtrinsic<
-        Rv,
-        {
-          pallet: 'Stableswap';
-          palletCall: {
-            name: 'AddLiquidity';
-            params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount> };
-          };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7873,21 +7647,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAssetAmount
      **/
     addLiquidityShares: GenericTxCall<
-      Rv,
       (
         poolId: number,
         shares: bigint,
         assetId: number,
         maxAssetAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'AddLiquidityShares';
             params: { poolId: number; shares: bigint; assetId: number; maxAssetAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7916,21 +7689,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minAmountOut
      **/
     removeLiquidityOneAsset: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         shareAmount: bigint,
         minAmountOut: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'RemoveLiquidityOneAsset';
             params: { poolId: number; assetId: number; shareAmount: bigint; minAmountOut: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7955,21 +7727,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxShareAmount
      **/
     withdrawAssetAmount: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         amount: bigint,
         maxShareAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'WithdrawAssetAmount';
             params: { poolId: number; assetId: number; amount: bigint; maxShareAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7995,7 +7766,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBuyAmount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetIn: number,
@@ -8003,14 +7773,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountIn: bigint,
         minBuyAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'Sell';
             params: { poolId: number; assetIn: number; assetOut: number; amountIn: bigint; minBuyAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8036,7 +7806,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxSellAmount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetOut: number,
@@ -8044,14 +7813,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountOut: bigint,
         maxSellAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'Buy';
             params: { poolId: number; assetOut: number; assetIn: number; amountOut: bigint; maxSellAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8078,20 +7847,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStableswapTradability} state
      **/
     setAssetTradableState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         state: PalletStableswapTradability,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'SetAssetTradableState';
             params: { poolId: number; assetId: number; state: PalletStableswapTradability };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8129,20 +7897,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsStableswapAssetAmount>} minAmountsOut
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         poolId: number,
         shareAmount: bigint,
         minAmountsOut: Array<HydradxTraitsStableswapAssetAmount>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { poolId: number; shareAmount: bigint; minAmountsOut: Array<HydradxTraitsStableswapAssetAmount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8185,7 +7952,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxPegUpdate
      **/
     createPoolWithPegs: GenericTxCall<
-      Rv,
       (
         shareAsset: number,
         assets: Array<number>,
@@ -8194,7 +7960,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         pegSource: Array<PalletStableswapPegSource>,
         maxPegUpdate: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
@@ -8208,7 +7973,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxPegUpdate: Perbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8237,20 +8003,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minShares
      **/
     addAssetsLiquidity: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assets: Array<HydradxTraitsStableswapAssetAmount>,
         minShares: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'AddAssetsLiquidity';
             params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount>; minShares: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8280,20 +8045,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStableswapPegSource} pegSource
      **/
     updateAssetPegSource: GenericTxCall<
-      Rv,
       (
         poolId: number,
         assetId: number,
         pegSource: PalletStableswapPegSource,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdateAssetPegSource';
             params: { poolId: number; assetId: number; pegSource: PalletStableswapPegSource };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8319,26 +8083,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxPegUpdate
      **/
     updatePoolMaxPegUpdate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxPegUpdate: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Stableswap';
           palletCall: {
             name: 'UpdatePoolMaxPegUpdate';
             params: { poolId: number; maxPegUpdate: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bonds`'s transaction calls
@@ -8372,20 +8135,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maturity
      **/
     issue: GenericTxCall<
-      Rv,
       (
         assetId: number,
         amount: bigint,
         maturity: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bonds';
           palletCall: {
             name: 'Issue';
             params: { assetId: number; amount: bigint; maturity: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8407,26 +8169,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     redeem: GenericTxCall<
-      Rv,
       (
         bondId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bonds';
           palletCall: {
             name: 'Redeem';
             params: { bondId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OtcSettlements`'s transaction calls
@@ -8459,27 +8220,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     settleOtcOrder: GenericTxCall<
-      Rv,
       (
         otcId: number,
         amount: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OtcSettlements';
           palletCall: {
             name: 'SettleOtcOrder';
             params: { otcId: number; amount: bigint; route: Array<HydradxTraitsRouterTrade> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `LBP`'s transaction calls
@@ -8533,7 +8293,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} repayTarget
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         poolOwner: AccountId32Like,
         assetA: number,
@@ -8547,7 +8306,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like,
         repayTarget: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -8566,7 +8324,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8601,7 +8360,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} repayTarget
      **/
     updatePoolData: GenericTxCall<
-      Rv,
       (
         poolId: AccountId32Like,
         poolOwner: AccountId32Like | undefined,
@@ -8613,7 +8371,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeCollector: AccountId32Like | undefined,
         repayTarget: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
@@ -8630,7 +8387,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               repayTarget: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8652,19 +8410,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, bigint]} amountB
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         amountA: [number, bigint],
         amountB: [number, bigint],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'AddLiquidity';
             params: { amountA: [number, bigint]; amountB: [number, bigint] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8684,16 +8441,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} poolId
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (poolId: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { poolId: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8720,21 +8476,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8761,28 +8516,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxLimit
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
         amount: bigint,
         maxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lbp';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYK`'s transaction calls
@@ -8805,21 +8559,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountB
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         assetA: number,
         amountA: bigint,
         assetB: number,
         amountB: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'CreatePool';
             params: { assetA: number; amountA: bigint; assetB: number; amountB: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8836,21 +8589,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amountBMaxLimit
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         amountA: bigint,
         amountBMaxLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'AddLiquidity';
             params: { assetA: number; assetB: number; amountA: bigint; amountBMaxLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8863,7 +8615,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minShares
      **/
     addLiquidityWithLimits: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -8871,14 +8622,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountBMaxLimit: bigint,
         minShares: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'AddLiquidityWithLimits';
             params: { assetA: number; assetB: number; amountA: bigint; amountBMaxLimit: bigint; minShares: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8895,20 +8646,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} shareAmount
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
         shareAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'RemoveLiquidity';
             params: { assetA: number; assetB: number; shareAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8921,7 +8671,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minAmountB
      **/
     removeLiquidityWithLimits: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -8929,14 +8678,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minAmountA: bigint,
         minAmountB: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'RemoveLiquidityWithLimits';
             params: { assetA: number; assetB: number; shareAmount: bigint; minAmountA: bigint; minAmountB: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8957,7 +8706,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
@@ -8965,14 +8713,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8992,7 +8740,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} discount
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetOut: number,
         assetIn: number,
@@ -9000,21 +8747,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxLimit: bigint,
         discount: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Xyk';
           palletCall: {
             name: 'Buy';
             params: { assetOut: number; assetIn: number; amount: bigint; maxLimit: bigint; discount: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referrals`'s transaction calls
@@ -9038,16 +8785,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     registerCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'RegisterCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9066,16 +8812,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     linkCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'LinkCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9090,16 +8835,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     convert: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'Convert';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9116,15 +8860,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimRewards: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'ClaimRewards';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9143,27 +8886,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletReferralsFeeDistribution} rewards
      **/
     setRewardPercentage: GenericTxCall<
-      Rv,
       (
         assetId: number,
         level: PalletReferralsLevel,
         rewards: PalletReferralsFeeDistribution,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referrals';
           palletCall: {
             name: 'SetRewardPercentage';
             params: { assetId: number; level: PalletReferralsLevel; rewards: PalletReferralsFeeDistribution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Liquidation`'s transaction calls
@@ -9194,7 +8936,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<HydradxTraitsRouterTrade>} route
      **/
     liquidate: GenericTxCall<
-      Rv,
       (
         collateralAsset: number,
         debtAsset: number,
@@ -9202,7 +8943,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         debtToCover: bigint,
         route: Array<HydradxTraitsRouterTrade>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Liquidation';
           palletCall: {
@@ -9215,7 +8955,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               route: Array<HydradxTraitsRouterTrade>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9225,23 +8966,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} contract
      **/
     setBorrowingContract: GenericTxCall<
-      Rv,
       (contract: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Liquidation';
           palletCall: {
             name: 'SetBorrowingContract';
             params: { contract: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `HSM`'s transaction calls
@@ -9282,7 +9022,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maxInHolding
      **/
     addCollateralAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         poolId: number,
@@ -9292,7 +9031,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         buybackRate: Perbill,
         maxInHolding: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
@@ -9307,7 +9045,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxInHolding: bigint | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9331,16 +9070,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     removeCollateralAsset: GenericTxCall<
-      Rv,
       (assetId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'RemoveCollateralAsset';
             params: { assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9373,7 +9111,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined | undefined} maxInHolding
      **/
     updateCollateralAsset: GenericTxCall<
-      Rv,
       (
         assetId: number,
         purchaseFee: Permill | undefined,
@@ -9382,7 +9119,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         buybackRate: Perbill | undefined,
         maxInHolding: bigint | undefined | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
@@ -9396,7 +9132,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxInHolding: bigint | undefined | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9435,21 +9172,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} slippageLimit
      **/
     sell: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amountIn: bigint,
         slippageLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'Sell';
             params: { assetIn: number; assetOut: number; amountIn: bigint; slippageLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9486,21 +9222,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} slippageLimit
      **/
     buy: GenericTxCall<
-      Rv,
       (
         assetIn: number,
         assetOut: number,
         amountOut: bigint,
         slippageLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'Buy';
             params: { assetIn: number; assetOut: number; amountOut: bigint; slippageLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9544,19 +9279,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletHsmArbitrage | undefined} arbitrage
      **/
     executeArbitrage: GenericTxCall<
-      Rv,
       (
         collateralAssetId: number,
         arbitrage: PalletHsmArbitrage | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'ExecuteArbitrage';
             params: { collateralAssetId: number; arbitrage: PalletHsmArbitrage | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9580,23 +9314,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} flashMinterAddr
      **/
     setFlashMinter: GenericTxCall<
-      Rv,
       (flashMinterAddr: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hsm';
           palletCall: {
             name: 'SetFlashMinter';
             params: { flashMinterAddr: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Tokens`'s transaction calls
@@ -9622,20 +9355,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9665,20 +9397,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferAll';
             params: { dest: AccountId32Like; currencyId: number; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9700,20 +9431,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9734,21 +9464,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: AccountId32Like,
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: AccountId32Like; dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9768,28 +9497,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newReserved
      **/
     setBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         newFree: bigint,
         newReserved: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tokens';
           palletCall: {
             name: 'SetBalance';
             params: { who: AccountId32Like; currencyId: number; newFree: bigint; newReserved: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Currencies`'s transaction calls
@@ -9806,20 +9534,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'Transfer';
             params: { dest: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9833,19 +9560,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferNativeCurrency: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'TransferNativeCurrency';
             params: { dest: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9859,27 +9585,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     updateBalance: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         currencyId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Currencies';
           palletCall: {
             name: 'UpdateBalance';
             params: { who: AccountId32Like; currencyId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -9889,15 +9614,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claim: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Claim';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9907,19 +9631,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {OrmlVestingVestingSchedule} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         schedule: OrmlVestingVestingSchedule,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { dest: AccountId32Like; schedule: OrmlVestingVestingSchedule };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9929,19 +9652,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<OrmlVestingVestingSchedule>} vestingSchedules
      **/
     updateVestingSchedules: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         vestingSchedules: Array<OrmlVestingVestingSchedule>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'UpdateVestingSchedules';
             params: { who: AccountId32Like; vestingSchedules: Array<OrmlVestingVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9950,23 +9672,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} dest
      **/
     claimFor: GenericTxCall<
-      Rv,
       (dest: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ClaimFor';
             params: { dest: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVM`'s transaction calls
@@ -9979,19 +9700,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         address: H160,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
             name: 'Withdraw';
             params: { address: H160; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10009,7 +9729,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     call: GenericTxCall<
-      Rv,
       (
         source: H160,
         target: H160,
@@ -10021,7 +9740,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -10038,7 +9756,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10056,7 +9775,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -10067,7 +9785,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -10083,7 +9800,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10101,7 +9819,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[H160, Array<H256>]>} accessList
      **/
     create2: GenericTxCall<
-      Rv,
       (
         source: H160,
         init: BytesLike,
@@ -10113,7 +9830,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         nonce: U256 | undefined,
         accessList: Array<[H160, Array<H256>]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Evm';
           palletCall: {
@@ -10130,14 +9846,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               accessList: Array<[H160, Array<H256>]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Ethereum`'s transaction calls
@@ -10149,23 +9866,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {EthereumTransactionTransactionV2} transaction
      **/
     transact: GenericTxCall<
-      Rv,
       (transaction: EthereumTransactionTransactionV2) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ethereum';
           palletCall: {
             name: 'Transact';
             params: { transaction: EthereumTransactionTransactionV2 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EVMAccounts`'s transaction calls
@@ -10186,15 +9902,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bindEvmAddress: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'BindEvmAddress';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10210,16 +9925,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     addContractDeployer: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'AddContractDeployer';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10235,16 +9949,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     removeContractDeployer: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'RemoveContractDeployer';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10259,15 +9972,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     renounceContractDeployer: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'RenounceContractDeployer';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10285,16 +9997,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     approveContract: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'ApproveContract';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10310,23 +10021,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H160} address
      **/
     disapproveContract: GenericTxCall<
-      Rv,
       (address: H160) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EvmAccounts';
           palletCall: {
             name: 'DisapproveContract';
             params: { address: H160 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKLiquidityMining`'s transaction calls
@@ -10374,7 +10084,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     createGlobalFarm: GenericTxCall<
-      Rv,
       (
         totalRewards: bigint,
         plannedYieldingPeriods: number,
@@ -10386,7 +10095,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minDeposit: bigint,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10403,7 +10111,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               priceAdjustment: FixedU128;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10423,19 +10132,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} priceAdjustment
      **/
     updateGlobalFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         priceAdjustment: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateGlobalFarm';
             params: { globalFarmId: number; priceAdjustment: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10455,16 +10163,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} globalFarmId
      **/
     terminateGlobalFarm: GenericTxCall<
-      Rv,
       (globalFarmId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateGlobalFarm';
             params: { globalFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10494,14 +10201,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletLiquidityMiningLoyaltyCurve | undefined} loyaltyCurve
      **/
     createYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
         loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10513,7 +10218,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               loyaltyCurve: PalletLiquidityMiningLoyaltyCurve | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10535,20 +10241,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     updateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'UpdateYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10573,19 +10278,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     stopYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'StopYieldFarm';
             params: { globalFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10614,21 +10318,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} multiplier
      **/
     resumeYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         multiplier: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ResumeYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; multiplier: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10658,20 +10361,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     terminateYieldFarm: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'TerminateYieldFarm';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10697,21 +10399,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} sharesAmount
      **/
     depositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         sharesAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'DepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; sharesAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10735,20 +10436,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} sharesAmount
      **/
     joinFarms: GenericTxCall<
-      Rv,
       (
         farmEntries: Array<[number, number]>,
         assetPair: PalletXykAssetPair,
         sharesAmount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'JoinFarms';
             params: { farmEntries: Array<[number, number]>; assetPair: PalletXykAssetPair; sharesAmount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10776,7 +10476,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, number]>} farmEntries
      **/
     addLiquidityAndJoinFarms: GenericTxCall<
-      Rv,
       (
         assetA: number,
         assetB: number,
@@ -10784,7 +10483,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amountBMaxLimit: bigint,
         farmEntries: Array<[number, number]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
@@ -10797,7 +10495,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               farmEntries: Array<[number, number]>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10824,21 +10523,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} depositId
      **/
     redepositShares: GenericTxCall<
-      Rv,
       (
         globalFarmId: number,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
         depositId: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'RedepositShares';
             params: { globalFarmId: number; yieldFarmId: number; assetPair: PalletXykAssetPair; depositId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10859,19 +10557,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} yieldFarmId
      **/
     claimRewards: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ClaimRewards';
             params: { depositId: bigint; yieldFarmId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10904,20 +10601,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletXykAssetPair} assetPair
      **/
     withdrawShares: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         yieldFarmId: number,
         assetPair: PalletXykAssetPair,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'WithdrawShares';
             params: { depositId: bigint; yieldFarmId: number; assetPair: PalletXykAssetPair };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10944,27 +10640,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} farmEntries
      **/
     exitFarms: GenericTxCall<
-      Rv,
       (
         depositId: bigint,
         assetPair: PalletXykAssetPair,
         farmEntries: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XykLiquidityMining';
           palletCall: {
             name: 'ExitFarms';
             params: { depositId: bigint; assetPair: PalletXykAssetPair; farmEntries: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XYKWarehouseLM`'s transaction calls
@@ -10973,7 +10668,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RelayChainInfo`'s transaction calls
@@ -10982,7 +10677,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `DCA`'s transaction calls
@@ -11019,19 +10714,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startExecutionBlock
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         schedule: PalletDcaSchedule,
         startExecutionBlock: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'Schedule';
             params: { schedule: PalletDcaSchedule; startExecutionBlock: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11052,19 +10746,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} nextExecutionBlock
      **/
     terminate: GenericTxCall<
-      Rv,
       (
         scheduleId: number,
         nextExecutionBlock: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'Terminate';
             params: { scheduleId: number; nextExecutionBlock: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11087,26 +10780,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} assetId
      **/
     unlockReserves: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         assetId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Dca';
           palletCall: {
             name: 'UnlockReserves';
             params: { who: AccountId32Like; assetId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -11121,14 +10813,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11140,7 +10830,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11151,19 +10842,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11177,7 +10867,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -11185,7 +10874,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11198,7 +10886,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11208,16 +10897,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11230,14 +10918,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11249,7 +10935,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11263,7 +10950,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {HydradxRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -11271,7 +10957,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: HydradxRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -11284,7 +10969,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: HydradxRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11307,20 +10993,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11343,20 +11028,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11366,16 +11050,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11385,23 +11068,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -11421,16 +11103,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPrimitivesParachainInherentParachainInherentData} data
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (data: CumulusPrimitivesParachainInherentParachainInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SetValidationData';
             params: { data: CumulusPrimitivesParachainInherentParachainInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11439,23 +11120,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -11464,7 +11144,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -11476,19 +11156,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11518,14 +11197,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11537,7 +11214,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11579,14 +11257,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} feeAssetItem
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11598,7 +11274,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11616,19 +11293,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11644,19 +11320,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV4Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV4Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11670,16 +11345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11692,16 +11366,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11716,16 +11389,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11768,7 +11440,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11776,7 +11447,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11789,7 +11459,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11820,7 +11491,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11828,7 +11498,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11841,7 +11510,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11854,16 +11524,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11909,7 +11578,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -11917,7 +11585,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -11930,7 +11597,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11946,19 +11614,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12021,7 +11688,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -12031,7 +11697,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -12046,14 +11711,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -12062,7 +11728,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -12075,19 +11741,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12112,14 +11777,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -12131,14 +11794,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OrmlXcm`'s transaction calls
@@ -12151,26 +11815,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendAsSovereign: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OrmlXcm';
           palletCall: {
             name: 'SendAsSovereign';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XTokens`'s transaction calls
@@ -12196,14 +11859,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12215,7 +11876,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12238,20 +11900,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiasset: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
             name: 'TransferMultiasset';
             params: { asset: XcmVersionedAsset; dest: XcmVersionedLocation; destWeightLimit: XcmV3WeightLimit };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12285,7 +11946,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferWithFee: GenericTxCall<
-      Rv,
       (
         currencyId: number,
         amount: bigint,
@@ -12293,7 +11953,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12306,7 +11965,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12339,14 +11999,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassetWithFee: GenericTxCall<
-      Rv,
       (
         asset: XcmVersionedAsset,
         fee: XcmVersionedAsset,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12358,7 +12016,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12385,14 +12044,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMulticurrencies: GenericTxCall<
-      Rv,
       (
         currencies: Array<[number, bigint]>,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12404,7 +12061,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12431,14 +12089,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} destWeightLimit
      **/
     transferMultiassets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         feeItem: number,
         dest: XcmVersionedLocation,
         destWeightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XTokens';
           palletCall: {
@@ -12450,14 +12106,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               destWeightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -12481,16 +12138,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12504,16 +12160,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12529,16 +12184,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12550,15 +12204,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12571,15 +12224,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12592,16 +12244,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12614,16 +12265,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12639,16 +12289,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12665,26 +12314,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -12705,19 +12353,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: HydradxRuntimeOpaqueSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: HydradxRuntimeOpaqueSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12737,22 +12384,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Ismp`'s transaction calls
@@ -12773,16 +12419,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<IsmpMessagingMessage>} messages
      **/
     handleUnsigned: GenericTxCall<
-      Rv,
       (messages: Array<IsmpMessagingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ismp';
           palletCall: {
             name: 'HandleUnsigned';
             params: { messages: Array<IsmpMessagingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12798,16 +12443,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {IsmpMessagingCreateConsensusState} message
      **/
     createConsensusClient: GenericTxCall<
-      Rv,
       (message: IsmpMessagingCreateConsensusState) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ismp';
           palletCall: {
             name: 'CreateConsensusClient';
             params: { message: IsmpMessagingCreateConsensusState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12820,16 +12464,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIsmpUtilsUpdateConsensusState} message
      **/
     updateConsensusState: GenericTxCall<
-      Rv,
       (message: PalletIsmpUtilsUpdateConsensusState) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ismp';
           palletCall: {
             name: 'UpdateConsensusState';
             params: { message: PalletIsmpUtilsUpdateConsensusState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12842,23 +12485,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIsmpUtilsFundMessageParams} message
      **/
     fundMessage: GenericTxCall<
-      Rv,
       (message: PalletIsmpUtilsFundMessageParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Ismp';
           palletCall: {
             name: 'FundMessage';
             params: { message: PalletIsmpUtilsFundMessageParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `IsmpParachain`'s transaction calls
@@ -12871,16 +12513,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {IsmpMessagingConsensusMessage} data
      **/
     updateParachainConsensus: GenericTxCall<
-      Rv,
       (data: IsmpMessagingConsensusMessage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IsmpParachain';
           palletCall: {
             name: 'UpdateParachainConsensus';
             params: { data: IsmpMessagingConsensusMessage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12890,16 +12531,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<IsmpParachainParachainData>} paraIds
      **/
     addParachain: GenericTxCall<
-      Rv,
       (paraIds: Array<IsmpParachainParachainData>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IsmpParachain';
           palletCall: {
             name: 'AddParachain';
             params: { paraIds: Array<IsmpParachainParachainData> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12909,23 +12549,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} paraIds
      **/
     removeParachain: GenericTxCall<
-      Rv,
       (paraIds: Array<number>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IsmpParachain';
           palletCall: {
             name: 'RemoveParachain';
             params: { paraIds: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TokenGateway`'s transaction calls
@@ -12938,16 +12577,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletTokenGatewayTeleportParams} params
      **/
     teleport: GenericTxCall<
-      Rv,
       (params: PalletTokenGatewayTeleportParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TokenGateway';
           palletCall: {
             name: 'Teleport';
             params: { params: PalletTokenGatewayTeleportParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12957,16 +12595,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[IsmpHostStateMachine, BytesLike]>} addresses
      **/
     setTokenGatewayAddresses: GenericTxCall<
-      Rv,
       (addresses: Array<[IsmpHostStateMachine, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TokenGateway';
           palletCall: {
             name: 'SetTokenGatewayAddresses';
             params: { addresses: Array<[IsmpHostStateMachine, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12980,16 +12617,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletTokenGatewayAssetRegistration} asset
      **/
     createErc6160Asset: GenericTxCall<
-      Rv,
       (asset: PalletTokenGatewayAssetRegistration) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TokenGateway';
           palletCall: {
             name: 'CreateErc6160Asset';
             params: { asset: PalletTokenGatewayAssetRegistration };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13002,16 +12638,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {TokenGatewayPrimitivesGatewayAssetUpdate} asset
      **/
     updateErc6160Asset: GenericTxCall<
-      Rv,
       (asset: TokenGatewayPrimitivesGatewayAssetUpdate) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TokenGateway';
           palletCall: {
             name: 'UpdateErc6160Asset';
             params: { asset: TokenGatewayPrimitivesGatewayAssetUpdate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13021,23 +12656,65 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletTokenGatewayPrecisionUpdate} update
      **/
     updateAssetPrecision: GenericTxCall<
-      Rv,
       (update: PalletTokenGatewayPrecisionUpdate) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TokenGateway';
           palletCall: {
             name: 'UpdateAssetPrecision';
             params: { update: PalletTokenGatewayPrecisionUpdate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
+  };
+  /**
+   * Pallet `IsmpOracle`'s transaction calls
+   **/
+  ismpOracle: {
+    /**
+     *
+     * @param {PalletIsmpOracleTestGetParams} params
+     **/
+    requestGet: GenericTxCall<
+      (params: PalletIsmpOracleTestGetParams) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'IsmpOracle';
+          palletCall: {
+            name: 'RequestGet';
+            params: { params: PalletIsmpOracleTestGetParams };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     *
+     * @param {PalletIsmpOracleTestPostParams} params
+     **/
+    requestPost: GenericTxCall<
+      (params: PalletIsmpOracleTestPostParams) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'IsmpOracle';
+          palletCall: {
+            name: 'RequestPost';
+            params: { params: PalletIsmpOracleTestPostParams };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Generic pallet tx call
+     **/
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `EmaOracle`'s transaction calls
@@ -13049,19 +12726,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     addOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'AddOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13071,19 +12747,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} assets
      **/
     removeOracle: GenericTxCall<
-      Rv,
       (
         source: FixedBytes<8>,
         assets: [number, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'RemoveOracle';
             params: { source: FixedBytes<8>; assets: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13094,27 +12769,49 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[bigint, bigint]} price
      **/
     updateBifrostOracle: GenericTxCall<
-      Rv,
       (
         assetA: XcmVersionedLocation,
         assetB: XcmVersionedLocation,
         price: [bigint, bigint],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'EmaOracle';
           palletCall: {
             name: 'UpdateBifrostOracle';
             params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
           };
-        }
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     *
+     * @param {XcmVersionedLocation} assetA
+     * @param {XcmVersionedLocation} assetB
+     * @param {[bigint, bigint]} price
+     **/
+    updateIsmpOracle: GenericTxCall<
+      (
+        assetA: XcmVersionedLocation,
+        assetB: XcmVersionedLocation,
+        price: [bigint, bigint],
+      ) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'EmaOracle';
+          palletCall: {
+            name: 'UpdateIsmpOracle';
+            params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
+          };
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Broadcast`'s transaction calls
@@ -13123,6 +12820,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/paseo-hydration/types.d.ts b/packages/chaintypes/src/paseo-hydration/types.d.ts
index fec770d0..31dccf4b 100644
--- a/packages/chaintypes/src/paseo-hydration/types.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/types.d.ts
@@ -117,6 +117,7 @@ export type HydradxRuntimeRuntimeEvent =
   | { pallet: 'IsmpParachain'; palletEvent: IsmpParachainEvent }
   | { pallet: 'Hyperbridge'; palletEvent: PalletHyperbridgeEvent }
   | { pallet: 'TokenGateway'; palletEvent: PalletTokenGatewayEvent }
+  | { pallet: 'IsmpOracle'; palletEvent: PalletIsmpOracleTestEvent }
   | { pallet: 'EmaOracle'; palletEvent: PalletEmaOracleEvent }
   | { pallet: 'Broadcast'; palletEvent: PalletBroadcastEvent };
 
@@ -1315,6 +1316,7 @@ export type HydradxRuntimeRuntimeCall =
   | { pallet: 'Ismp'; palletCall: PalletIsmpCall }
   | { pallet: 'IsmpParachain'; palletCall: IsmpParachainCall }
   | { pallet: 'TokenGateway'; palletCall: PalletTokenGatewayCall }
+  | { pallet: 'IsmpOracle'; palletCall: PalletIsmpOracleTestCall }
   | { pallet: 'EmaOracle'; palletCall: PalletEmaOracleCall }
   | { pallet: 'Broadcast'; palletCall: PalletBroadcastCall };
 
@@ -1381,6 +1383,7 @@ export type HydradxRuntimeRuntimeCallLike =
   | { pallet: 'Ismp'; palletCall: PalletIsmpCallLike }
   | { pallet: 'IsmpParachain'; palletCall: IsmpParachainCallLike }
   | { pallet: 'TokenGateway'; palletCall: PalletTokenGatewayCallLike }
+  | { pallet: 'IsmpOracle'; palletCall: PalletIsmpOracleTestCallLike }
   | { pallet: 'EmaOracle'; palletCall: PalletEmaOracleCallLike }
   | { pallet: 'Broadcast'; palletCall: PalletBroadcastCallLike };
 
@@ -6462,6 +6465,29 @@ export type PalletOmnipoolCall =
    *
    **/
   | { name: 'RemoveLiquidityWithLimit'; params: { positionId: bigint; amount: bigint; minLimit: bigint } }
+  /**
+   * Remove all liquidity from position
+   *
+   * Limit protection is applied.
+   *
+   * `remove_all_liquidity` removes all shares amount from given PositionId (NFT instance).
+   *
+   * Asset's tradable state must contain REMOVE_LIQUIDITY flag, otherwise `NotAllowed` error is returned.
+   *
+   * if all shares from given position are removed, position is destroyed and NFT is burned.
+   *
+   * Remove all liquidity fails if price difference between spot price and oracle price is higher than allowed by `PriceBarrier`.
+   *
+   * Dynamic withdrawal fee is applied if withdrawal is not safe. It is calculated using spot price and external price oracle.
+   * Withdrawal is considered safe when trading is disabled.
+   *
+   * Parameters:
+   * - `position_id`: The identifier of position which liquidity is entirely removed from.
+   *
+   * Emits `LiquidityRemoved` event when successful.
+   *
+   **/
+  | { name: 'RemoveAllLiquidity'; params: { positionId: bigint; minLimit: bigint } }
   /**
    * Sacrifice LP position in favor of pool.
    *
@@ -6697,6 +6723,29 @@ export type PalletOmnipoolCallLike =
    *
    **/
   | { name: 'RemoveLiquidityWithLimit'; params: { positionId: bigint; amount: bigint; minLimit: bigint } }
+  /**
+   * Remove all liquidity from position
+   *
+   * Limit protection is applied.
+   *
+   * `remove_all_liquidity` removes all shares amount from given PositionId (NFT instance).
+   *
+   * Asset's tradable state must contain REMOVE_LIQUIDITY flag, otherwise `NotAllowed` error is returned.
+   *
+   * if all shares from given position are removed, position is destroyed and NFT is burned.
+   *
+   * Remove all liquidity fails if price difference between spot price and oracle price is higher than allowed by `PriceBarrier`.
+   *
+   * Dynamic withdrawal fee is applied if withdrawal is not safe. It is calculated using spot price and external price oracle.
+   * Withdrawal is considered safe when trading is disabled.
+   *
+   * Parameters:
+   * - `position_id`: The identifier of position which liquidity is entirely removed from.
+   *
+   * Emits `LiquidityRemoved` event when successful.
+   *
+   **/
+  | { name: 'RemoveAllLiquidity'; params: { positionId: bigint; minLimit: bigint } }
   /**
    * Sacrifice LP position in favor of pool.
    *
@@ -8426,29 +8475,6 @@ export type PalletStableswapCall =
       name: 'UpdateAmplification';
       params: { poolId: number; finalAmplification: number; startBlock: number; endBlock: number };
     }
-  /**
-   * Add liquidity to selected pool.
-   *
-   * Use `add_assets_liquidity` instead.
-   * This extrinsics will be removed in the future.
-   *
-   * First call of `add_liquidity` must provide "initial liquidity" of all assets.
-   *
-   * If there is liquidity already in the pool, LP can provide liquidity of any number of pool assets.
-   *
-   * LP must have sufficient amount of each asset.
-   *
-   * Origin is given corresponding amount of shares.
-   *
-   * Parameters:
-   * - `origin`: liquidity provider
-   * - `pool_id`: Pool Id
-   * - `assets`: asset id and liquidity amount provided
-   *
-   * Emits `LiquidityAdded` event when successful.
-   * Emits `pallet_broadcast::Swapped` event when successful.
-   **/
-  | { name: 'AddLiquidity'; params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount> } }
   /**
    * Add liquidity to selected pool given exact amount of shares to receive.
    *
@@ -8751,29 +8777,6 @@ export type PalletStableswapCallLike =
       name: 'UpdateAmplification';
       params: { poolId: number; finalAmplification: number; startBlock: number; endBlock: number };
     }
-  /**
-   * Add liquidity to selected pool.
-   *
-   * Use `add_assets_liquidity` instead.
-   * This extrinsics will be removed in the future.
-   *
-   * First call of `add_liquidity` must provide "initial liquidity" of all assets.
-   *
-   * If there is liquidity already in the pool, LP can provide liquidity of any number of pool assets.
-   *
-   * LP must have sufficient amount of each asset.
-   *
-   * Origin is given corresponding amount of shares.
-   *
-   * Parameters:
-   * - `origin`: liquidity provider
-   * - `pool_id`: Pool Id
-   * - `assets`: asset id and liquidity amount provided
-   *
-   * Emits `LiquidityAdded` event when successful.
-   * Emits `pallet_broadcast::Swapped` event when successful.
-   **/
-  | { name: 'AddLiquidity'; params: { poolId: number; assets: Array<HydradxTraitsStableswapAssetAmount> } }
   /**
    * Add liquidity to selected pool given exact amount of shares to receive.
    *
@@ -14035,6 +14038,21 @@ export type TokenGatewayPrimitivesGatewayAssetUpdate = {
 
 export type PalletTokenGatewayPrecisionUpdate = { assetId: number; precisions: Array<[IsmpHostStateMachine, number]> };
 
+/**
+ * Contains a variant per dispatchable extrinsic that this pallet has.
+ **/
+export type PalletIsmpOracleTestCall =
+  | { name: 'RequestGet'; params: { params: PalletIsmpOracleTestGetParams } }
+  | { name: 'RequestPost'; params: { params: PalletIsmpOracleTestPostParams } };
+
+export type PalletIsmpOracleTestCallLike =
+  | { name: 'RequestGet'; params: { params: PalletIsmpOracleTestGetParams } }
+  | { name: 'RequestPost'; params: { params: PalletIsmpOracleTestPostParams } };
+
+export type PalletIsmpOracleTestGetParams = { dest: IsmpHostStateMachine; height: bigint };
+
+export type PalletIsmpOracleTestPostParams = { dest: IsmpHostStateMachine; to: Bytes; body: Bytes };
+
 /**
  * Contains a variant per dispatchable extrinsic that this pallet has.
  **/
@@ -14044,6 +14062,10 @@ export type PalletEmaOracleCall =
   | {
       name: 'UpdateBifrostOracle';
       params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
+    }
+  | {
+      name: 'UpdateIsmpOracle';
+      params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
     };
 
 export type PalletEmaOracleCallLike =
@@ -14052,6 +14074,10 @@ export type PalletEmaOracleCallLike =
   | {
       name: 'UpdateBifrostOracle';
       params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
+    }
+  | {
+      name: 'UpdateIsmpOracle';
+      params: { assetA: XcmVersionedLocation; assetB: XcmVersionedLocation; price: [bigint, bigint] };
     };
 
 /**
@@ -14921,10 +14947,7 @@ export type PalletLiquidationEvent =
   /**
    * Money market position has been liquidated
    **/
-  {
-    name: 'Liquidated';
-    data: { user: H160; collateralAsset: number; debtAsset: number; debtToCover: bigint; profit: bigint };
-  };
+  { name: 'Liquidated'; data: { user: H160; collateralAsset: number; debtAsset: number; profit: bigint } };
 
 /**
  * The `Event` enum of this pallet
@@ -16261,6 +16284,18 @@ export type PalletTokenGatewayEvent =
       };
     };
 
+/**
+ * The `Event` enum of this pallet
+ **/
+export type PalletIsmpOracleTestEvent =
+  | { name: 'GetRequestSent'; data: { commitment: H256 } }
+  | { name: 'PostRequestSent'; data: { commitment: H256 } }
+  | { name: 'GetRequestResponded'; data: { commitment: H256; storageValues: Array<IsmpRouterStorageValue> } }
+  | { name: 'WstEthPriceReceived'; data: { commitment: H256; ethPerWsteth: U256 } }
+  | { name: 'PostRequestResponded'; data: { commitment: H256 } }
+  | { name: 'GetRequestTimedOut'; data: { commitment: H256 } }
+  | { name: 'PostResponseTimedOut'; data: { commitment: H256 } };
+
 /**
  * The `Event` enum of this pallet
  **/
@@ -19892,6 +19927,11 @@ export type PalletTokenGatewayError =
    **/
   | 'NotAssetOwner';
 
+/**
+ * The `Error` enum of this pallet.
+ **/
+export type PalletIsmpOracleTestError = 'GetRequestFailed';
+
 export type PalletEmaOracleOracleEntry = {
   price: HydraDxMathRatio;
   volume: HydradxTraitsOracleVolume;
@@ -20174,5 +20214,6 @@ export type HydradxRuntimeRuntimeError =
   | { pallet: 'Ismp'; palletError: PalletIsmpError }
   | { pallet: 'Hyperbridge'; palletError: PalletHyperbridgeError }
   | { pallet: 'TokenGateway'; palletError: PalletTokenGatewayError }
+  | { pallet: 'IsmpOracle'; palletError: PalletIsmpOracleTestError }
   | { pallet: 'EmaOracle'; palletError: PalletEmaOracleError }
   | { pallet: 'Broadcast'; palletError: PalletBroadcastError };
diff --git a/packages/chaintypes/src/paseo-hydration/view-functions.d.ts b/packages/chaintypes/src/paseo-hydration/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/paseo-hydration/view-functions.d.ts
+++ b/packages/chaintypes/src/paseo-hydration/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/paseo-people/consts.d.ts b/packages/chaintypes/src/paseo-people/consts.d.ts
index 24b9f857..76e984e9 100644
--- a/packages/chaintypes/src/paseo-people/consts.d.ts
+++ b/packages/chaintypes/src/paseo-people/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, AccountId32 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   SpWeightsWeightV2Weight,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/paseo-people/errors.d.ts b/packages/chaintypes/src/paseo-people/errors.d.ts
index c0047182..68ab2de3 100644
--- a/packages/chaintypes/src/paseo-people/errors.d.ts
+++ b/packages/chaintypes/src/paseo-people/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -108,12 +108,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -122,67 +122,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -191,92 +191,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -285,32 +285,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -319,32 +319,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -354,152 +354,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -509,32 +509,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -542,24 +542,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -568,12 +568,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -582,78 +582,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -662,47 +662,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -711,158 +711,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -871,11 +871,11 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/paseo-people/events.d.ts b/packages/chaintypes/src/paseo-people/events.d.ts
index 211fef99..bfa12a09 100644
--- a/packages/chaintypes/src/paseo-people/events.d.ts
+++ b/packages/chaintypes/src/paseo-people/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, FixedBytes, Bytes, Result } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -23,7 +23,7 @@ import type {
   PalletProxyDepositKind,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -31,18 +31,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -51,33 +45,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -86,7 +79,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -95,13 +88,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -110,18 +102,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -131,7 +122,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -140,7 +130,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -152,7 +142,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -171,20 +160,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -199,7 +187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -219,7 +206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -241,7 +227,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -261,7 +246,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -275,7 +259,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -284,40 +268,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -326,87 +309,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -417,7 +400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -426,7 +408,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -436,7 +418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -445,18 +426,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -465,13 +445,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -481,7 +460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -490,13 +468,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -507,7 +484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -516,7 +492,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -526,28 +502,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -556,12 +532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -570,13 +546,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -591,7 +566,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -606,7 +580,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -618,7 +591,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -629,7 +601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -640,7 +611,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -652,7 +622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -669,7 +638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -681,7 +649,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -693,7 +660,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -709,7 +675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -718,13 +683,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -736,7 +700,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -747,7 +710,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -758,7 +720,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -769,7 +730,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -785,7 +745,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -797,7 +756,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -813,7 +771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -823,7 +780,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -834,7 +790,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -844,7 +799,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -854,7 +808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -863,14 +816,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -880,7 +832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -890,7 +841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -899,7 +849,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -909,29 +859,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -941,7 +886,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -969,7 +913,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1004,7 +947,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1034,7 +976,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1053,7 +994,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1063,47 +1004,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1113,7 +1054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1123,7 +1063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1133,7 +1072,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1149,7 +1087,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1159,7 +1096,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1168,7 +1104,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1177,14 +1113,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: PeoplePaseoRuntimeProxyType; disambiguationIndex: number }
@@ -1194,7 +1129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       { pure: AccountId32; spawner: AccountId32; proxyType: PeoplePaseoRuntimeProxyType; disambiguationIndex: number }
@@ -1203,13 +1137,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeoplePaseoRuntimeProxyType; delay: number }
@@ -1219,7 +1152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeoplePaseoRuntimeProxyType; delay: number }
@@ -1229,7 +1161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1238,7 +1169,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1247,23 +1178,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1273,7 +1203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1282,23 +1211,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1308,7 +1231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -1317,18 +1239,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1339,7 +1255,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1348,23 +1263,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1373,19 +1287,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1394,22 +1307,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -1419,7 +1332,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -1434,7 +1346,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -1453,13 +1364,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -1473,6 +1383,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/paseo-people/index.d.ts b/packages/chaintypes/src/paseo-people/index.d.ts
index 6e89223e..a5b4c7ee 100644
--- a/packages/chaintypes/src/paseo-people/index.d.ts
+++ b/packages/chaintypes/src/paseo-people/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PeoplePaseoRuntimeRuntimeCall,
@@ -41,26 +41,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPaseoPeopleApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: PaseoPeopleApi
- * @specVersion: 1009003
+ * @specVersion: 2000001
  **/
-export interface PaseoPeopleApi {
-  legacy: VersionedPaseoPeopleApi<RpcLegacy>;
-  v2: VersionedPaseoPeopleApi<RpcV2>;
+export interface PaseoPeopleApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/paseo-people/json-rpc.d.ts b/packages/chaintypes/src/paseo-people/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/paseo-people/json-rpc.d.ts
+++ b/packages/chaintypes/src/paseo-people/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/paseo-people/query.d.ts b/packages/chaintypes/src/paseo-people/query.d.ts
index 54b88834..95242937 100644
--- a/packages/chaintypes/src/paseo-people/query.d.ts
+++ b/packages/chaintypes/src/paseo-people/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -67,7 +67,7 @@ import type {
   PalletIdentityProvider,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -78,35 +78,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -114,7 +114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -122,28 +122,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -156,14 +156,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -180,21 +180,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -202,21 +202,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -229,12 +229,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -250,7 +250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -260,7 +260,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -274,7 +273,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -285,7 +284,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -294,14 +293,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -310,7 +309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -323,7 +322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -334,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -346,7 +345,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -360,7 +359,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -374,7 +372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -384,7 +382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -395,7 +393,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -406,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -416,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -425,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -435,7 +431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -446,7 +441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -455,21 +450,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -477,7 +472,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -485,7 +480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -493,7 +488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -502,12 +497,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -518,7 +513,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -528,12 +523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -543,12 +538,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -561,7 +556,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -572,12 +567,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -588,14 +583,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -626,7 +621,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -637,7 +632,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -647,7 +642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -655,7 +650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -663,12 +658,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -678,18 +673,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -700,12 +695,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -716,7 +711,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -727,7 +722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -735,7 +730,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -744,7 +739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -753,12 +748,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -769,14 +764,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -784,7 +779,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -792,7 +787,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PeoplePaseoRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PeoplePaseoRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PeoplePaseoRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -803,7 +798,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -811,7 +806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PeoplePaseoRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => PeoplePaseoRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PeoplePaseoRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -820,7 +815,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -828,7 +822,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -839,7 +833,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -848,12 +842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -868,7 +862,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -878,12 +872,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -901,7 +895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -913,7 +907,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -922,7 +916,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -934,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -944,14 +936,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -960,7 +952,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -968,7 +959,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -979,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -987,7 +978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -998,7 +989,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1006,7 +997,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1015,7 +1006,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1027,7 +1017,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1040,7 +1029,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1052,14 +1040,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1068,7 +1056,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1080,7 +1067,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1090,7 +1076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1103,7 +1089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1115,7 +1101,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1126,7 +1112,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1134,7 +1119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1147,7 +1132,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1157,7 +1141,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1166,7 +1150,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1174,7 +1157,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1187,7 +1170,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1195,7 +1177,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1208,11 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1220,16 +1198,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1244,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -1252,7 +1226,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1261,7 +1235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1273,7 +1247,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1283,7 +1257,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1291,7 +1265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1304,7 +1278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1318,7 +1292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1332,12 +1305,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1348,11 +1321,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/paseo-people/runtime.d.ts b/packages/chaintypes/src/paseo-people/runtime.d.ts
index 37e46069..5defb8cc 100644
--- a/packages/chaintypes/src/paseo-people/runtime.d.ts
+++ b/packages/chaintypes/src/paseo-people/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -27,6 +27,8 @@ import type {
   SpRuntimeTransactionValidityValidTransaction,
   SpRuntimeTransactionValidityTransactionSource,
   SpCoreCryptoKeyTypeId,
+  FrameSupportViewFunctionsViewFunctionDispatchError,
+  FrameSupportViewFunctionsViewFunctionId,
   PalletTransactionPaymentRuntimeDispatchInfo,
   PalletTransactionPaymentFeeDetails,
   SpWeightsWeightV2Weight,
@@ -49,7 +51,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -61,19 +63,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -84,12 +86,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -111,12 +113,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -127,7 +129,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -135,7 +137,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -143,12 +145,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -159,7 +161,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -170,7 +172,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -179,12 +181,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -200,7 +202,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -211,7 +212,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -220,7 +221,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -232,14 +232,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -262,7 +261,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -275,7 +273,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -287,12 +285,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -310,7 +308,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -321,14 +319,36 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
+   **/
+  runtimeViewFunction: {
+    /**
+     * Execute a view function query.
+     *
+     * @callname: RuntimeViewFunction_execute_view_function
+     * @param {FrameSupportViewFunctionsViewFunctionId} query_id
+     * @param {BytesLike} input
+     **/
+    executeViewFunction: GenericRuntimeApiMethod<
+      (
+        queryId: FrameSupportViewFunctionsViewFunctionId,
+        input: BytesLike,
+      ) => Promise<Result<Bytes, FrameSupportViewFunctionsViewFunctionDispatchError>>
+    >;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -340,12 +360,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -358,7 +378,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -369,7 +388,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -378,19 +396,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -404,7 +422,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PeoplePaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -416,7 +433,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PeoplePaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -426,7 +442,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -434,12 +450,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -456,7 +472,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -471,7 +486,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -488,7 +502,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -507,7 +520,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -517,7 +529,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -532,7 +544,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PeoplePaseoRuntimeOriginCaller,
         call: PeoplePaseoRuntimeRuntimeCallLike,
@@ -548,7 +559,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -558,7 +568,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -571,14 +581,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -596,7 +605,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -615,7 +623,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -625,7 +632,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -638,7 +645,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -652,7 +658,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -662,7 +667,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -677,12 +682,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -693,12 +698,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -719,7 +724,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -740,7 +745,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -750,11 +755,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/paseo-people/tx.d.ts b/packages/chaintypes/src/paseo-people/tx.d.ts
index acc2a70c..6f3a8d85 100644
--- a/packages/chaintypes/src/paseo-people/tx.d.ts
+++ b/packages/chaintypes/src/paseo-people/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type { MultiAddressLike, Extrinsic, BytesLike, H256, AccountId32Like, FixedBytes, Data } from 'dedot/codecs';
 import type {
@@ -38,16 +36,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PeoplePaseoRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PeoplePaseoRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -60,16 +60,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -79,16 +78,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -98,16 +96,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -120,16 +117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -139,16 +135,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -158,16 +153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -181,19 +175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -203,16 +196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -225,16 +217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -251,16 +242,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -278,23 +268,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -315,12 +304,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -330,7 +317,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -339,23 +327,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -385,23 +372,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -410,7 +396,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -426,16 +412,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -452,20 +437,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -477,15 +461,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -499,23 +482,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -534,19 +516,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -559,20 +540,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -588,19 +568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -625,19 +604,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -650,19 +628,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -679,16 +656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -701,19 +677,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -728,19 +703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -757,26 +731,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -800,16 +773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -823,16 +795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -848,16 +819,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -869,15 +839,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -890,15 +859,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -911,16 +879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -933,16 +900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -958,16 +924,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -984,26 +949,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1024,19 +988,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PeoplePaseoRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PeoplePaseoRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1056,22 +1019,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -1084,15 +1046,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1105,15 +1066,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1127,16 +1087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1150,16 +1109,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1173,23 +1131,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -1201,19 +1158,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1245,14 +1201,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1264,7 +1218,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1308,14 +1263,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1327,7 +1280,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1345,19 +1299,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1373,19 +1326,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1399,16 +1351,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1421,16 +1372,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1445,16 +1395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1497,7 +1446,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1505,7 +1453,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1518,7 +1465,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1549,7 +1497,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1557,7 +1504,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1570,7 +1516,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1583,16 +1530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1638,7 +1584,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1646,7 +1591,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1659,7 +1603,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1675,19 +1620,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1750,7 +1694,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -1760,7 +1703,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1775,7 +1717,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1796,19 +1739,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1819,16 +1761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1838,22 +1779,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -1862,7 +1802,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -1875,19 +1815,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1912,14 +1851,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -1931,14 +1868,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1967,16 +1905,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePaseoRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PeoplePaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1999,19 +1936,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2033,16 +1969,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePaseoRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PeoplePaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2058,19 +1993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PeoplePaseoRuntimeOriginCaller,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PeoplePaseoRuntimeOriginCaller; call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2092,16 +2026,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePaseoRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PeoplePaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2117,19 +2050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PeoplePaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PeoplePaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2162,19 +2094,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PeoplePaseoRuntimeRuntimeCallLike,
         fallback: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PeoplePaseoRuntimeRuntimeCallLike; fallback: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2189,26 +2120,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PeoplePaseoRuntimeOriginCaller,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PeoplePaseoRuntimeOriginCaller; call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -2232,19 +2162,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2296,7 +2225,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2304,7 +2232,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PeoplePaseoRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2317,7 +2244,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2360,7 +2288,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2368,7 +2295,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2381,7 +2307,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2414,14 +2341,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2433,7 +2358,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2457,27 +2383,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2499,13 +2424,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PeoplePaseoRuntimeProxyType | undefined,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2516,7 +2439,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeoplePaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2536,20 +2460,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeoplePaseoRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PeoplePaseoRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2567,20 +2490,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeoplePaseoRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PeoplePaseoRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2594,15 +2516,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2631,20 +2552,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PeoplePaseoRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PeoplePaseoRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2673,7 +2593,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PeoplePaseoRuntimeProxyType,
@@ -2681,7 +2600,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2694,7 +2612,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2719,19 +2638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2751,19 +2669,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2783,19 +2700,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2818,14 +2734,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PeoplePaseoRuntimeProxyType | undefined,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2837,7 +2751,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeoplePaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2853,22 +2768,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2886,16 +2800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2914,16 +2827,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimePeopleIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PeoplePaseoRuntimePeopleIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PeoplePaseoRuntimePeopleIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2941,16 +2853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2966,15 +2877,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3000,19 +2910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3031,16 +2940,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3057,19 +2965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3086,19 +2993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3115,19 +3021,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3154,21 +3059,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3189,16 +3093,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3215,19 +3118,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3241,19 +3143,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3269,16 +3170,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3296,15 +3196,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3320,20 +3219,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3344,19 +3242,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3381,14 +3278,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -3400,7 +3295,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3411,16 +3307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3432,16 +3327,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3451,16 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3472,16 +3365,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3492,16 +3384,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3512,23 +3403,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -3540,16 +3430,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: PeoplePaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3564,19 +3453,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: PeoplePaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: PeoplePaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3587,16 +3475,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3610,19 +3497,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePaseoRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: PeoplePaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: PeoplePaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3633,21 +3519,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/paseo-people/types.d.ts b/packages/chaintypes/src/paseo-people/types.d.ts
index c03f9a23..583fbc43 100644
--- a/packages/chaintypes/src/paseo-people/types.d.ts
+++ b/packages/chaintypes/src/paseo-people/types.d.ts
@@ -6144,6 +6144,13 @@ export type SpRuntimeTransactionValidityValidTransaction = {
   propagate: boolean;
 };
 
+export type FrameSupportViewFunctionsViewFunctionId = { prefix: FixedBytes<16>; suffix: FixedBytes<16> };
+
+export type FrameSupportViewFunctionsViewFunctionDispatchError =
+  | { type: 'NotImplemented' }
+  | { type: 'NotFound'; value: FrameSupportViewFunctionsViewFunctionId }
+  | { type: 'Codec' };
+
 export type PalletTransactionPaymentRuntimeDispatchInfo = {
   weight: SpWeightsWeightV2Weight;
   class: FrameSupportDispatchDispatchClass;
diff --git a/packages/chaintypes/src/paseo-people/view-functions.d.ts b/packages/chaintypes/src/paseo-people/view-functions.d.ts
index 63340830..bcf912e4 100644
--- a/packages/chaintypes/src/paseo-people/view-functions.d.ts
+++ b/packages/chaintypes/src/paseo-people/view-functions.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { PeoplePaseoRuntimeRuntimeCallLike, PeoplePaseoRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -15,7 +15,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeoplePaseoRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PeoplePaseoRuntimeRuntimeCallLike, proxyType: PeoplePaseoRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -26,13 +25,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeoplePaseoRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: PeoplePaseoRuntimeProxyType, against: PeoplePaseoRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/paseo/consts.d.ts b/packages/chaintypes/src/paseo/consts.d.ts
index 3bfdc0e7..dab6b939 100644
--- a/packages/chaintypes/src/paseo/consts.d.ts
+++ b/packages/chaintypes/src/paseo/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, AccountId32, Bytes, Perbill, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   StagingXcmV5Junctions,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/paseo/errors.d.ts b/packages/chaintypes/src/paseo/errors.d.ts
index 6125dc92..0bdb4a44 100644
--- a/packages/chaintypes/src/paseo/errors.d.ts
+++ b/packages/chaintypes/src/paseo/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -68,32 +68,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -102,47 +102,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -151,27 +151,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -180,32 +180,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -214,67 +214,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -283,182 +283,182 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -467,32 +467,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -502,43 +502,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -547,63 +547,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -612,68 +612,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -682,77 +682,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -761,32 +761,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -795,38 +795,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -835,33 +835,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -870,12 +870,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -884,47 +884,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -933,78 +933,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -1013,68 +1013,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -1083,22 +1083,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -1107,82 +1107,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -1191,17 +1191,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -1210,44 +1210,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -1256,160 +1256,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -1420,37 +1420,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -1459,17 +1459,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -1478,52 +1478,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StakingAhClient`'s errors
@@ -1532,12 +1532,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Could not process incoming message because incoming messages are blocked.
      **/
-    Blocked: GenericPalletError<Rv>;
+    Blocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Configuration`'s errors
@@ -1546,12 +1546,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The new value for a configuration parameter is invalid.
      **/
-    InvalidNewValue: GenericPalletError<Rv>;
+    InvalidNewValue: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInclusion`'s errors
@@ -1560,95 +1560,95 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Validator index out of bounds.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Candidate submitted but para not scheduled.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Head data exceeds the configured maximum.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Code upgrade prematurely.
      **/
-    PrematureCodeUpgrade: GenericPalletError<Rv>;
+    PrematureCodeUpgrade: GenericPalletError;
 
     /**
      * Output code is too large
      **/
-    NewCodeTooLarge: GenericPalletError<Rv>;
+    NewCodeTooLarge: GenericPalletError;
 
     /**
      * The candidate's relay-parent was not allowed. Either it was
      * not recent enough or it didn't advance based on the last parachain block.
      **/
-    DisallowedRelayParent: GenericPalletError<Rv>;
+    DisallowedRelayParent: GenericPalletError;
 
     /**
      * Failed to compute group index for the core: either it's out of bounds
      * or the relay parent doesn't belong to the current session.
      **/
-    InvalidAssignment: GenericPalletError<Rv>;
+    InvalidAssignment: GenericPalletError;
 
     /**
      * Invalid group index in core assignment.
      **/
-    InvalidGroupIndex: GenericPalletError<Rv>;
+    InvalidGroupIndex: GenericPalletError;
 
     /**
      * Insufficient (non-majority) backing.
      **/
-    InsufficientBacking: GenericPalletError<Rv>;
+    InsufficientBacking: GenericPalletError;
 
     /**
      * Invalid (bad signature, unknown validator, etc.) backing.
      **/
-    InvalidBacking: GenericPalletError<Rv>;
+    InvalidBacking: GenericPalletError;
 
     /**
      * The validation data hash does not match expected.
      **/
-    ValidationDataHashMismatch: GenericPalletError<Rv>;
+    ValidationDataHashMismatch: GenericPalletError;
 
     /**
      * The downward message queue is not processed correctly.
      **/
-    IncorrectDownwardMessageHandling: GenericPalletError<Rv>;
+    IncorrectDownwardMessageHandling: GenericPalletError;
 
     /**
      * At least one upward message sent does not pass the acceptance criteria.
      **/
-    InvalidUpwardMessages: GenericPalletError<Rv>;
+    InvalidUpwardMessages: GenericPalletError;
 
     /**
      * The candidate didn't follow the rules of HRMP watermark advancement.
      **/
-    HrmpWatermarkMishandling: GenericPalletError<Rv>;
+    HrmpWatermarkMishandling: GenericPalletError;
 
     /**
      * The HRMP messages sent by the candidate is not valid.
      **/
-    InvalidOutboundHrmp: GenericPalletError<Rv>;
+    InvalidOutboundHrmp: GenericPalletError;
 
     /**
      * The validation code hash of the candidate is not valid.
      **/
-    InvalidValidationCodeHash: GenericPalletError<Rv>;
+    InvalidValidationCodeHash: GenericPalletError;
 
     /**
      * The `para_head` hash in the candidate descriptor doesn't match the hash of the actual
      * para head in the commitments.
      **/
-    ParaHeadMismatch: GenericPalletError<Rv>;
+    ParaHeadMismatch: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInherent`'s errors
@@ -1657,29 +1657,29 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Inclusion inherent called more than once per block.
      **/
-    TooManyInclusionInherents: GenericPalletError<Rv>;
+    TooManyInclusionInherents: GenericPalletError;
 
     /**
      * The hash of the submitted parent header doesn't correspond to the saved block hash of
      * the parent.
      **/
-    InvalidParentHeader: GenericPalletError<Rv>;
+    InvalidParentHeader: GenericPalletError;
 
     /**
      * Inherent data was filtered during execution. This should have only been done
      * during creation.
      **/
-    InherentDataFilteredDuringExecution: GenericPalletError<Rv>;
+    InherentDataFilteredDuringExecution: GenericPalletError;
 
     /**
      * Too many candidates supplied.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Paras`'s errors
@@ -1688,87 +1688,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Para is not registered in our system.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Para cannot be onboarded because it is already tracked by our system.
      **/
-    CannotOnboard: GenericPalletError<Rv>;
+    CannotOnboard: GenericPalletError;
 
     /**
      * Para cannot be offboarded at this time.
      **/
-    CannotOffboard: GenericPalletError<Rv>;
+    CannotOffboard: GenericPalletError;
 
     /**
      * Para cannot be upgraded to a lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para cannot be downgraded to an on-demand parachain.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is stale.
      **/
-    PvfCheckStatementStale: GenericPalletError<Rv>;
+    PvfCheckStatementStale: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is for a future session.
      **/
-    PvfCheckStatementFuture: GenericPalletError<Rv>;
+    PvfCheckStatementFuture: GenericPalletError;
 
     /**
      * Claimed validator index is out of bounds.
      **/
-    PvfCheckValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    PvfCheckValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * The signature for the PVF pre-checking is invalid.
      **/
-    PvfCheckInvalidSignature: GenericPalletError<Rv>;
+    PvfCheckInvalidSignature: GenericPalletError;
 
     /**
      * The given validator already has cast a vote.
      **/
-    PvfCheckDoubleVote: GenericPalletError<Rv>;
+    PvfCheckDoubleVote: GenericPalletError;
 
     /**
      * The given PVF does not exist at the moment of process a vote.
      **/
-    PvfCheckSubjectInvalid: GenericPalletError<Rv>;
+    PvfCheckSubjectInvalid: GenericPalletError;
 
     /**
      * Parachain cannot currently schedule a code upgrade.
      **/
-    CannotUpgradeCode: GenericPalletError<Rv>;
+    CannotUpgradeCode: GenericPalletError;
 
     /**
      * Invalid validation code size.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Invalid block number.
      **/
-    InvalidBlockNumber: GenericPalletError<Rv>;
+    InvalidBlockNumber: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Hrmp`'s errors
@@ -1777,107 +1777,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The sender tried to open a channel to themselves.
      **/
-    OpenHrmpChannelToSelf: GenericPalletError<Rv>;
+    OpenHrmpChannelToSelf: GenericPalletError;
 
     /**
      * The recipient is not a valid para.
      **/
-    OpenHrmpChannelInvalidRecipient: GenericPalletError<Rv>;
+    OpenHrmpChannelInvalidRecipient: GenericPalletError;
 
     /**
      * The requested capacity is zero.
      **/
-    OpenHrmpChannelZeroCapacity: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroCapacity: GenericPalletError;
 
     /**
      * The requested capacity exceeds the global limit.
      **/
-    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError;
 
     /**
      * The requested maximum message size is 0.
      **/
-    OpenHrmpChannelZeroMessageSize: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroMessageSize: GenericPalletError;
 
     /**
      * The open request requested the message size that exceeds the global limit.
      **/
-    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError;
 
     /**
      * The channel already exists
      **/
-    OpenHrmpChannelAlreadyExists: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyExists: GenericPalletError;
 
     /**
      * There is already a request to open the same channel.
      **/
-    OpenHrmpChannelAlreadyRequested: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyRequested: GenericPalletError;
 
     /**
      * The sender already has the maximum number of allowed outbound channels.
      **/
-    OpenHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    OpenHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The channel from the sender to the origin doesn't exist.
      **/
-    AcceptHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    AcceptHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel is already confirmed.
      **/
-    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The recipient already has the maximum number of allowed inbound channels.
      **/
-    AcceptHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    AcceptHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The origin tries to close a channel where it is neither the sender nor the recipient.
      **/
-    CloseHrmpChannelUnauthorized: GenericPalletError<Rv>;
+    CloseHrmpChannelUnauthorized: GenericPalletError;
 
     /**
      * The channel to be closed doesn't exist.
      **/
-    CloseHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    CloseHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel close request is already requested.
      **/
-    CloseHrmpChannelAlreadyUnderway: GenericPalletError<Rv>;
+    CloseHrmpChannelAlreadyUnderway: GenericPalletError;
 
     /**
      * Canceling is requested by neither the sender nor recipient of the open channel request.
      **/
-    CancelHrmpOpenChannelUnauthorized: GenericPalletError<Rv>;
+    CancelHrmpOpenChannelUnauthorized: GenericPalletError;
 
     /**
      * The open request doesn't exist.
      **/
-    OpenHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    OpenHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * Cannot cancel an HRMP open channel request because it is already confirmed.
      **/
-    OpenHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The provided witness data is wrong.
      **/
-    WrongWitness: GenericPalletError<Rv>;
+    WrongWitness: GenericPalletError;
 
     /**
      * The channel between these two chains cannot be authorized.
      **/
-    ChannelCreationNotAuthorized: GenericPalletError<Rv>;
+    ChannelCreationNotAuthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasDisputes`'s errors
@@ -1886,52 +1886,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Duplicate dispute statement sets provided.
      **/
-    DuplicateDisputeStatementSets: GenericPalletError<Rv>;
+    DuplicateDisputeStatementSets: GenericPalletError;
 
     /**
      * Ancient dispute statement provided.
      **/
-    AncientDisputeStatement: GenericPalletError<Rv>;
+    AncientDisputeStatement: GenericPalletError;
 
     /**
      * Validator index on statement is out of bounds for session.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Invalid signature on statement.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Validator vote submitted more than once to dispute.
      **/
-    DuplicateStatement: GenericPalletError<Rv>;
+    DuplicateStatement: GenericPalletError;
 
     /**
      * A dispute where there are only votes on one side.
      **/
-    SingleSidedDispute: GenericPalletError<Rv>;
+    SingleSidedDispute: GenericPalletError;
 
     /**
      * A dispute vote from a malicious backer.
      **/
-    MaliciousBacker: GenericPalletError<Rv>;
+    MaliciousBacker: GenericPalletError;
 
     /**
      * No backing votes were provides along dispute statements.
      **/
-    MissingBackingVotes: GenericPalletError<Rv>;
+    MissingBackingVotes: GenericPalletError;
 
     /**
      * Unconfirmed dispute statement sets provided.
      **/
-    UnconfirmedDispute: GenericPalletError<Rv>;
+    UnconfirmedDispute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasSlashing`'s errors
@@ -1940,38 +1940,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The key ownership proof is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * The session index is too old or invalid.
      **/
-    InvalidSessionIndex: GenericPalletError<Rv>;
+    InvalidSessionIndex: GenericPalletError;
 
     /**
      * The candidate hash is invalid.
      **/
-    InvalidCandidateHash: GenericPalletError<Rv>;
+    InvalidCandidateHash: GenericPalletError;
 
     /**
      * There is no pending slash for the given validator index and time
      * slot.
      **/
-    InvalidValidatorIndex: GenericPalletError<Rv>;
+    InvalidValidatorIndex: GenericPalletError;
 
     /**
      * The validator index does not match the validator id.
      **/
-    ValidatorIndexIdMismatch: GenericPalletError<Rv>;
+    ValidatorIndexIdMismatch: GenericPalletError;
 
     /**
      * The given slashing report is valid but already previously reported.
      **/
-    DuplicateSlashingReport: GenericPalletError<Rv>;
+    DuplicateSlashingReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OnDemand`'s errors
@@ -1980,40 +1980,40 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The order queue is full, `place_order` will not continue.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The current spot price is higher than the max amount specified in the `place_order`
      * call, making it invalid.
      **/
-    SpotPriceHigherThanMaxAmount: GenericPalletError<Rv>;
+    SpotPriceHigherThanMaxAmount: GenericPalletError;
 
     /**
      * The account doesn't have enough credits to purchase on-demand coretime.
      **/
-    InsufficientCredits: GenericPalletError<Rv>;
+    InsufficientCredits: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s errors
    **/
   coretimeAssignmentProvider: {
-    AssignmentsEmpty: GenericPalletError<Rv>;
+    AssignmentsEmpty: GenericPalletError;
 
     /**
      * assign_core is only allowed to append new assignments at the end of already existing
      * ones or update the last entry.
      **/
-    DisallowedInsert: GenericPalletError<Rv>;
+    DisallowedInsert: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Registrar`'s errors
@@ -2022,79 +2022,79 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The ID is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * The ID is already registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * The caller is not the owner of this Id.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Invalid para code size.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * Invalid para head data size.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Para is not a Parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Para is not a Parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Cannot deregister para
      **/
-    CannotDeregister: GenericPalletError<Rv>;
+    CannotDeregister: GenericPalletError;
 
     /**
      * Cannot schedule downgrade of lease holding parachain to on-demand parachain
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * Cannot schedule upgrade of on-demand parachain to lease holding parachain
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para is locked from manipulation by the manager. Must use parachain or relay chain
      * governance.
      **/
-    ParaLocked: GenericPalletError<Rv>;
+    ParaLocked: GenericPalletError;
 
     /**
      * The ID given for registration has not been reserved.
      **/
-    NotReserved: GenericPalletError<Rv>;
+    NotReserved: GenericPalletError;
 
     /**
      * The validation code is invalid.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Cannot perform a parachain slot / lifecycle swap. Check that the state of both paras
      * are correct for the swap to work.
      **/
-    CannotSwap: GenericPalletError<Rv>;
+    CannotSwap: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Slots`'s errors
@@ -2103,17 +2103,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parachain ID is not onboarding.
      **/
-    ParaNotOnboarding: GenericPalletError<Rv>;
+    ParaNotOnboarding: GenericPalletError;
 
     /**
      * There was an error with the lease.
      **/
-    LeaseError: GenericPalletError<Rv>;
+    LeaseError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Auctions`'s errors
@@ -2122,42 +2122,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * This auction is already in progress.
      **/
-    AuctionInProgress: GenericPalletError<Rv>;
+    AuctionInProgress: GenericPalletError;
 
     /**
      * The lease period is in the past.
      **/
-    LeasePeriodInPast: GenericPalletError<Rv>;
+    LeasePeriodInPast: GenericPalletError;
 
     /**
      * Para is not registered
      **/
-    ParaNotRegistered: GenericPalletError<Rv>;
+    ParaNotRegistered: GenericPalletError;
 
     /**
      * Not a current auction.
      **/
-    NotCurrentAuction: GenericPalletError<Rv>;
+    NotCurrentAuction: GenericPalletError;
 
     /**
      * Not an auction.
      **/
-    NotAuction: GenericPalletError<Rv>;
+    NotAuction: GenericPalletError;
 
     /**
      * Auction has already ended.
      **/
-    AuctionEnded: GenericPalletError<Rv>;
+    AuctionEnded: GenericPalletError;
 
     /**
      * The para is already leased out for part of this range.
      **/
-    AlreadyLeasedOut: GenericPalletError<Rv>;
+    AlreadyLeasedOut: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Crowdloan`'s errors
@@ -2166,123 +2166,123 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The current lease period is more than the first lease period.
      **/
-    FirstPeriodInPast: GenericPalletError<Rv>;
+    FirstPeriodInPast: GenericPalletError;
 
     /**
      * The first lease period needs to at least be less than 3 `max_value`.
      **/
-    FirstPeriodTooFarInFuture: GenericPalletError<Rv>;
+    FirstPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * Last lease period must be greater than first lease period.
      **/
-    LastPeriodBeforeFirstPeriod: GenericPalletError<Rv>;
+    LastPeriodBeforeFirstPeriod: GenericPalletError;
 
     /**
      * The last lease period cannot be more than 3 periods after the first period.
      **/
-    LastPeriodTooFarInFuture: GenericPalletError<Rv>;
+    LastPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * The campaign ends before the current block number. The end must be in the future.
      **/
-    CannotEndInPast: GenericPalletError<Rv>;
+    CannotEndInPast: GenericPalletError;
 
     /**
      * The end date for this crowdloan is not sensible.
      **/
-    EndTooFarInFuture: GenericPalletError<Rv>;
+    EndTooFarInFuture: GenericPalletError;
 
     /**
      * There was an overflow.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The contribution was below the minimum, `MinContribution`.
      **/
-    ContributionTooSmall: GenericPalletError<Rv>;
+    ContributionTooSmall: GenericPalletError;
 
     /**
      * Invalid fund index.
      **/
-    InvalidParaId: GenericPalletError<Rv>;
+    InvalidParaId: GenericPalletError;
 
     /**
      * Contributions exceed maximum amount.
      **/
-    CapExceeded: GenericPalletError<Rv>;
+    CapExceeded: GenericPalletError;
 
     /**
      * The contribution period has already ended.
      **/
-    ContributionPeriodOver: GenericPalletError<Rv>;
+    ContributionPeriodOver: GenericPalletError;
 
     /**
      * The origin of this call is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * This crowdloan does not correspond to a parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * This parachain lease is still active and retirement cannot yet begin.
      **/
-    LeaseActive: GenericPalletError<Rv>;
+    LeaseActive: GenericPalletError;
 
     /**
      * This parachain's bid or lease is still active and withdraw cannot yet begin.
      **/
-    BidOrLeaseActive: GenericPalletError<Rv>;
+    BidOrLeaseActive: GenericPalletError;
 
     /**
      * The crowdloan has not yet ended.
      **/
-    FundNotEnded: GenericPalletError<Rv>;
+    FundNotEnded: GenericPalletError;
 
     /**
      * There are no contributions stored in this crowdloan.
      **/
-    NoContributions: GenericPalletError<Rv>;
+    NoContributions: GenericPalletError;
 
     /**
      * The crowdloan is not ready to dissolve. Potentially still has a slot or in retirement
      * period.
      **/
-    NotReadyToDissolve: GenericPalletError<Rv>;
+    NotReadyToDissolve: GenericPalletError;
 
     /**
      * Invalid signature.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * The provided memo is too large.
      **/
-    MemoTooLarge: GenericPalletError<Rv>;
+    MemoTooLarge: GenericPalletError;
 
     /**
      * The fund is already in `NewRaise`
      **/
-    AlreadyInNewRaise: GenericPalletError<Rv>;
+    AlreadyInNewRaise: GenericPalletError;
 
     /**
      * No contributions allowed during the VRF delay
      **/
-    VrfDelayInProgress: GenericPalletError<Rv>;
+    VrfDelayInProgress: GenericPalletError;
 
     /**
      * A lease period has not started yet, due to an offset in the starting block.
      **/
-    NoLeasePeriod: GenericPalletError<Rv>;
+    NoLeasePeriod: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Coretime`'s errors
@@ -2291,23 +2291,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The paraid making the call is not the coretime brokerage system parachain.
      **/
-    NotBroker: GenericPalletError<Rv>;
+    NotBroker: GenericPalletError;
 
     /**
      * Requested revenue information `when` parameter was in the future from the current
      * block height.
      **/
-    RequestedFutureRevenue: GenericPalletError<Rv>;
+    RequestedFutureRevenue: GenericPalletError;
 
     /**
      * Failed to transfer assets to the coretime chain
      **/
-    AssetTransferFailed: GenericPalletError<Rv>;
+    AssetTransferFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2316,7 +2316,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2327,32 +2327,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmPallet`'s errors
@@ -2362,152 +2362,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -2517,32 +2517,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -2550,24 +2550,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2576,22 +2576,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Beefy`'s errors
@@ -2600,42 +2600,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A double voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidDoubleVotingProof: GenericPalletError<Rv>;
+    InvalidDoubleVotingProof: GenericPalletError;
 
     /**
      * A fork voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidForkVotingProof: GenericPalletError<Rv>;
+    InvalidForkVotingProof: GenericPalletError;
 
     /**
      * A future block voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidFutureBlockVotingProof: GenericPalletError<Rv>;
+    InvalidFutureBlockVotingProof: GenericPalletError;
 
     /**
      * The session of the equivocation proof is invalid
      **/
-    InvalidEquivocationProofSession: GenericPalletError<Rv>;
+    InvalidEquivocationProofSession: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaSudoWrapper`'s errors
@@ -2644,58 +2644,58 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The specified parachain is not registered.
      **/
-    ParaDoesntExist: GenericPalletError<Rv>;
+    ParaDoesntExist: GenericPalletError;
 
     /**
      * The specified parachain is already registered.
      **/
-    ParaAlreadyExists: GenericPalletError<Rv>;
+    ParaAlreadyExists: GenericPalletError;
 
     /**
      * A DMP message couldn't be sent because it exceeds the maximum size allowed for a
      * downward message.
      **/
-    ExceedsMaxMessageSize: GenericPalletError<Rv>;
+    ExceedsMaxMessageSize: GenericPalletError;
 
     /**
      * A DMP message couldn't be sent because the destination is unreachable.
      **/
-    Unroutable: GenericPalletError<Rv>;
+    Unroutable: GenericPalletError;
 
     /**
      * Could not schedule para cleanup.
      **/
-    CouldntCleanup: GenericPalletError<Rv>;
+    CouldntCleanup: GenericPalletError;
 
     /**
      * Not a parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Not a lease holding parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Cannot upgrade on-demand parachain to lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Cannot downgrade lease holding parachain to on-demand.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * There are more cores than supported by the runtime.
      **/
-    TooManyCores: GenericPalletError<Rv>;
+    TooManyCores: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -2704,105 +2704,105 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RcMigrator`'s errors
    **/
   rcMigrator: {
-    Unreachable: GenericPalletError<Rv>;
-    OutOfWeight: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
+    OutOfWeight: GenericPalletError;
 
     /**
      * Failed to send XCM message to AH.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to withdraw account from RC for migration to AH.
      **/
-    FailedToWithdrawAccount: GenericPalletError<Rv>;
+    FailedToWithdrawAccount: GenericPalletError;
 
     /**
      * Indicates that the specified block number is in the past.
      **/
-    PastBlockNumber: GenericPalletError<Rv>;
+    PastBlockNumber: GenericPalletError;
 
     /**
      * Indicates that there is not enough time for staking to lock.
      *
      * Schedule the migration at least two sessions before the current era ends.
      **/
-    EraEndsTooSoon: GenericPalletError<Rv>;
+    EraEndsTooSoon: GenericPalletError;
 
     /**
      * Balance accounting overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Balance accounting underflow.
      **/
-    BalanceUnderflow: GenericPalletError<Rv>;
+    BalanceUnderflow: GenericPalletError;
 
     /**
      * The query response is invalid.
      **/
-    InvalidQueryResponse: GenericPalletError<Rv>;
+    InvalidQueryResponse: GenericPalletError;
 
     /**
      * The xcm query was not found.
      **/
-    QueryNotFound: GenericPalletError<Rv>;
+    QueryNotFound: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmSendError: GenericPalletError<Rv>;
+    XcmSendError: GenericPalletError;
 
     /**
      * The migration stage is not reachable from the current stage.
      **/
-    UnreachableStage: GenericPalletError<Rv>;
+    UnreachableStage: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * The AH UMP queue priority configuration is already set.
      **/
-    AhUmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    AhUmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * The account is referenced by some other pallet. It might have freezes or holds.
      **/
-    AccountReferenced: GenericPalletError<Rv>;
+    AccountReferenced: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The stage transition is invalid.
      **/
-    InvalidStageTransition: GenericPalletError<Rv>;
+    InvalidStageTransition: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/paseo/events.d.ts b/packages/chaintypes/src/paseo/events.d.ts
index 1450ca01..8ba4812a 100644
--- a/packages/chaintypes/src/paseo/events.d.ts
+++ b/packages/chaintypes/src/paseo/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -66,7 +66,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -74,18 +74,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -94,33 +88,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -129,7 +122,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -138,18 +131,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -159,7 +151,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -169,7 +160,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -179,7 +169,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -189,7 +178,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -200,7 +188,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -210,7 +197,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -219,12 +205,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -233,22 +219,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -257,23 +243,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -282,7 +267,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -291,40 +276,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -333,87 +317,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -424,7 +408,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -433,7 +416,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -443,18 +426,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -463,14 +440,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -480,17 +456,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -498,39 +469,38 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -540,7 +510,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -549,38 +518,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -591,12 +555,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Historical`'s events
@@ -605,17 +569,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The merkle root of the validators of the said session were stored
      **/
-    RootStored: GenericPalletEvent<Rv, 'Historical', 'RootStored', { index: number }>;
+    RootStored: GenericPalletEvent<'Historical', 'RootStored', { index: number }>;
 
     /**
      * The merkle roots of up to this session index were pruned
      **/
-    RootsPruned: GenericPalletEvent<Rv, 'Historical', 'RootsPruned', { upTo: number }>;
+    RootsPruned: GenericPalletEvent<'Historical', 'RootsPruned', { upTo: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -625,28 +589,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -656,7 +620,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -665,17 +628,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -684,38 +647,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -724,18 +681,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -751,28 +702,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -781,18 +732,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -802,7 +752,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -811,12 +760,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -826,7 +775,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -851,7 +799,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -876,7 +823,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -901,7 +847,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -921,7 +866,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -947,7 +891,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -958,7 +901,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -973,7 +915,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -993,7 +934,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1008,7 +948,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1028,7 +967,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1048,7 +986,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1068,7 +1005,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1088,7 +1024,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1113,7 +1048,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1133,7 +1067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1152,16 +1085,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1170,7 +1102,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -1180,7 +1112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -1189,7 +1120,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -1198,28 +1129,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1229,47 +1155,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1278,14 +1204,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1300,7 +1225,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1314,13 +1238,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PaseoRuntimeConstantsProxyProxyType; delay: number }
@@ -1330,7 +1253,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PaseoRuntimeConstantsProxyProxyType; delay: number }
@@ -1340,7 +1262,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1349,7 +1270,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1359,7 +1280,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1369,7 +1289,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1379,7 +1298,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1395,7 +1313,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1405,7 +1322,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1414,7 +1330,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -1423,28 +1339,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -1453,38 +1368,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -1493,7 +1407,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -1502,13 +1416,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -1518,7 +1431,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -1527,12 +1439,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -1548,7 +1460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -1562,7 +1473,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -1573,23 +1483,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -1598,7 +1507,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -1607,17 +1516,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -1626,13 +1535,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -1641,12 +1549,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -1662,7 +1565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -1677,7 +1579,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -1686,13 +1587,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -1706,7 +1606,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -1717,7 +1616,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -1726,13 +1624,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -1742,7 +1639,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -1752,7 +1648,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -1762,7 +1657,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -1772,7 +1666,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -1782,7 +1675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -1792,7 +1684,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -1802,7 +1693,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -1812,7 +1702,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -1821,19 +1710,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -1843,7 +1726,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -1853,7 +1735,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -1869,7 +1750,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -1878,22 +1759,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -1901,17 +1777,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -1921,7 +1797,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1931,7 +1806,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1941,7 +1815,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1951,7 +1824,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1960,7 +1832,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingAhClient`'s events
@@ -1970,7 +1842,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new validator set has been received.
      **/
     ValidatorSetReceived: GenericPalletEvent<
-      Rv,
       'StakingAhClient',
       'ValidatorSetReceived',
       { id: number; newValidatorSetCount: number; pruneUpTo?: number | undefined; leftover: boolean }
@@ -1982,24 +1853,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Note that this event is more resembling an error, but we use an event because in this
      * pallet we need to mutate storage upon some failures.
      **/
-    CouldNotMergeAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'CouldNotMergeAndDropped', null>;
+    CouldNotMergeAndDropped: GenericPalletEvent<'StakingAhClient', 'CouldNotMergeAndDropped', null>;
 
     /**
      * The validator set received is way too small, as per
      * [`Config::MinimumValidatorSetSize`].
      **/
-    SetTooSmallAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'SetTooSmallAndDropped', null>;
+    SetTooSmallAndDropped: GenericPalletEvent<'StakingAhClient', 'SetTooSmallAndDropped', null>;
 
     /**
      * Something occurred that should never happen under normal operation. Logged as an event
      * for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParaInclusion`'s events
@@ -2009,7 +1880,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was backed. `[candidate, head_data]`
      **/
     CandidateBacked: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateBacked',
       [
@@ -2024,7 +1894,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was included. `[candidate, head_data]`
      **/
     CandidateIncluded: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateIncluded',
       [
@@ -2039,7 +1908,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate timed out. `[candidate, head_data]`
      **/
     CandidateTimedOut: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateTimedOut',
       [
@@ -2053,7 +1921,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some upward messages have been received and will be processed.
      **/
     UpwardMessagesReceived: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'UpwardMessagesReceived',
       { from: PolkadotParachainPrimitivesPrimitivesId; count: number }
@@ -2062,7 +1929,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Paras`'s events
@@ -2071,39 +1938,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current code has been updated for a Para. `para_id`
      **/
-    CurrentCodeUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentCodeUpdated: GenericPalletEvent<'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Current head has been updated for a Para. `para_id`
      **/
-    CurrentHeadUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentHeadUpdated: GenericPalletEvent<'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A code upgrade has been scheduled for a Para. `para_id`
      **/
-    CodeUpgradeScheduled: GenericPalletEvent<
-      Rv,
-      'Paras',
-      'CodeUpgradeScheduled',
-      PolkadotParachainPrimitivesPrimitivesId
-    >;
+    CodeUpgradeScheduled: GenericPalletEvent<'Paras', 'CodeUpgradeScheduled', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A new head has been noted for a Para. `para_id`
      **/
-    NewHeadNoted: GenericPalletEvent<Rv, 'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
+    NewHeadNoted: GenericPalletEvent<'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A para has been queued to execute pending actions. `para_id`
      **/
-    ActionQueued: GenericPalletEvent<Rv, 'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
+    ActionQueued: GenericPalletEvent<'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
 
     /**
      * The given para either initiated or subscribed to a PVF check for the given validation
      * code. `code_hash` `para_id`
      **/
     PvfCheckStarted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckStarted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2114,7 +1975,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckAccepted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckAccepted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2125,7 +1985,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckRejected: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckRejected',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2135,7 +1994,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The upgrade cooldown was removed.
      **/
     UpgradeCooldownRemoved: GenericPalletEvent<
-      Rv,
       'Paras',
       'UpgradeCooldownRemoved',
       {
@@ -2150,7 +2008,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new code hash has been authorized for a Para.
      **/
     CodeAuthorized: GenericPalletEvent<
-      Rv,
       'Paras',
       'CodeAuthorized',
       {
@@ -2174,7 +2031,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Hrmp`'s events
@@ -2184,7 +2041,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel requested.
      **/
     OpenChannelRequested: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelRequested',
       {
@@ -2199,7 +2055,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel request sent by the receiver was canceled by either party.
      **/
     OpenChannelCanceled: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelCanceled',
       {
@@ -2212,7 +2067,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel accepted.
      **/
     OpenChannelAccepted: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelAccepted',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2222,7 +2076,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * HRMP channel closed.
      **/
     ChannelClosed: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'ChannelClosed',
       {
@@ -2235,7 +2088,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened via Root origin.
      **/
     HrmpChannelForceOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpChannelForceOpened',
       {
@@ -2250,7 +2102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened with a system chain.
      **/
     HrmpSystemChannelOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpSystemChannelOpened',
       {
@@ -2265,7 +2116,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel's deposits were updated.
      **/
     OpenChannelDepositsUpdated: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelDepositsUpdated',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2274,7 +2124,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParasDisputes`'s events
@@ -2284,7 +2134,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A dispute has been initiated. \[candidate hash, dispute location\]
      **/
     DisputeInitiated: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeInitiated',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeLocation]
@@ -2295,7 +2144,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `\[para id, candidate hash, dispute result\]`
      **/
     DisputeConcluded: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeConcluded',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeResult]
@@ -2307,12 +2155,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * instead revert the block at the given height. This should be the
      * number of the child of the last known valid block in the chain.
      **/
-    Revert: GenericPalletEvent<Rv, 'ParasDisputes', 'Revert', number>;
+    Revert: GenericPalletEvent<'ParasDisputes', 'Revert', number>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OnDemand`'s events
@@ -2322,7 +2170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An order was placed at some spot price amount by orderer ordered_by
      **/
     OnDemandOrderPlaced: GenericPalletEvent<
-      Rv,
       'OnDemand',
       'OnDemandOrderPlaced',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; spotPrice: bigint; orderedBy: AccountId32 }
@@ -2331,42 +2178,34 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The value of the spot price has likely changed
      **/
-    SpotPriceSet: GenericPalletEvent<Rv, 'OnDemand', 'SpotPriceSet', { spotPrice: bigint }>;
+    SpotPriceSet: GenericPalletEvent<'OnDemand', 'SpotPriceSet', { spotPrice: bigint }>;
 
     /**
      * An account was given credits.
      **/
-    AccountCredited: GenericPalletEvent<Rv, 'OnDemand', 'AccountCredited', { who: AccountId32; amount: bigint }>;
+    AccountCredited: GenericPalletEvent<'OnDemand', 'AccountCredited', { who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Registrar`'s events
    **/
   registrar: {
     Registered: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Registered',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; manager: AccountId32 }
     >;
-    Deregistered: GenericPalletEvent<
-      Rv,
-      'Registrar',
-      'Deregistered',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    Deregistered: GenericPalletEvent<'Registrar', 'Deregistered', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
     Reserved: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Reserved',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; who: AccountId32 }
     >;
     Swapped: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Swapped',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; otherId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2375,7 +2214,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Slots`'s events
@@ -2384,7 +2223,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new `[lease_period]` is beginning.
      **/
-    NewLeasePeriod: GenericPalletEvent<Rv, 'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
+    NewLeasePeriod: GenericPalletEvent<'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
 
     /**
      * A para has won the right to a continuous set of lease periods as a parachain.
@@ -2392,7 +2231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Second balance is the total amount reserved.
      **/
     Leased: GenericPalletEvent<
-      Rv,
       'Slots',
       'Leased',
       {
@@ -2408,7 +2246,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Auctions`'s events
@@ -2419,7 +2257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * close and the first lease period of the quadruplet that is auctioned.
      **/
     AuctionStarted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'AuctionStarted',
       { auctionIndex: number; leasePeriod: number; ending: number }
@@ -2428,14 +2265,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An auction ended. All funds become unreserved.
      **/
-    AuctionClosed: GenericPalletEvent<Rv, 'Auctions', 'AuctionClosed', { auctionIndex: number }>;
+    AuctionClosed: GenericPalletEvent<'Auctions', 'AuctionClosed', { auctionIndex: number }>;
 
     /**
      * Funds were reserved for a winning bid. First balance is the extra amount reserved.
      * Second is the total.
      **/
     Reserved: GenericPalletEvent<
-      Rv,
       'Auctions',
       'Reserved',
       { bidder: AccountId32; extraReserved: bigint; totalAmount: bigint }
@@ -2444,14 +2280,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Funds were unreserved since bidder is no longer active. `[bidder, amount]`
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
 
     /**
      * Someone attempted to lease the same slot twice for a parachain. The amount is held in
      * reserve but no parachain slot has been leased.
      **/
     ReserveConfiscated: GenericPalletEvent<
-      Rv,
       'Auctions',
       'ReserveConfiscated',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; leaser: AccountId32; amount: bigint }
@@ -2461,7 +2296,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new bid has been accepted as the current winner.
      **/
     BidAccepted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'BidAccepted',
       {
@@ -2477,12 +2311,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The winning offset was chosen for an auction. This will map into the `Winning` storage
      * map.
      **/
-    WinningOffset: GenericPalletEvent<Rv, 'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
+    WinningOffset: GenericPalletEvent<'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Crowdloan`'s events
@@ -2491,13 +2325,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Create a new crowdloaning campaign.
      **/
-    Created: GenericPalletEvent<Rv, 'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Created: GenericPalletEvent<'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Contributed to a crowd sale.
      **/
     Contributed: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Contributed',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2507,7 +2340,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdrew full balance of a contributor.
      **/
     Withdrew: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Withdrew',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2518,7 +2350,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * over child keys that still need to be killed.
      **/
     PartiallyRefunded: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'PartiallyRefunded',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2527,23 +2358,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * All loans in a fund have been refunded.
      **/
-    AllRefunded: GenericPalletEvent<
-      Rv,
-      'Crowdloan',
-      'AllRefunded',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    AllRefunded: GenericPalletEvent<'Crowdloan', 'AllRefunded', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Fund is dissolved.
      **/
-    Dissolved: GenericPalletEvent<Rv, 'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Dissolved: GenericPalletEvent<'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * The result of trying to submit a new bid to the Slots pallet.
      **/
     HandleBidResult: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'HandleBidResult',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; result: Result<[], DispatchError> }
@@ -2552,13 +2377,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The configuration to a crowdloan has been edited.
      **/
-    Edited: GenericPalletEvent<Rv, 'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Edited: GenericPalletEvent<'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * A memo has been updated.
      **/
     MemoUpdated: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'MemoUpdated',
       { who: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; memo: Bytes }
@@ -2568,7 +2392,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain has been moved to `NewRaise`
      **/
     AddedToNewRaise: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'AddedToNewRaise',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2577,7 +2400,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Coretime`'s events
@@ -2586,17 +2409,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The broker chain has asked for revenue information for a specific block.
      **/
-    RevenueInfoRequested: GenericPalletEvent<Rv, 'Coretime', 'RevenueInfoRequested', { when: number }>;
+    RevenueInfoRequested: GenericPalletEvent<'Coretime', 'RevenueInfoRequested', { when: number }>;
 
     /**
      * A core has received a new assignment from the broker chain.
      **/
-    CoreAssigned: GenericPalletEvent<Rv, 'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
+    CoreAssigned: GenericPalletEvent<'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -2607,7 +2430,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -2616,22 +2438,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmPallet`'s events
@@ -2640,13 +2462,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'Sent',
       {
@@ -2661,7 +2482,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SendFailed',
       {
@@ -2676,7 +2496,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -2688,7 +2507,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2699,7 +2517,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -2709,12 +2526,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Query response has been received and query is removed. The registered notification has
      * been dispatched and executed successfully.
      **/
-    Notified: GenericPalletEvent<
-      Rv,
-      'XcmPallet',
-      'Notified',
-      { queryId: bigint; palletIndex: number; callIndex: number }
-    >;
+    Notified: GenericPalletEvent<'XcmPallet', 'Notified', { queryId: bigint; palletIndex: number; callIndex: number }>;
 
     /**
      * Query response has been received and query is removed. The registered notification
@@ -2722,7 +2534,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyOverweight',
       {
@@ -2739,7 +2550,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2751,7 +2561,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2763,7 +2572,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -2779,7 +2587,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2788,13 +2595,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2806,7 +2612,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2817,7 +2622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -2828,7 +2632,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -2839,7 +2642,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -2855,7 +2657,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2867,7 +2668,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerier',
       {
@@ -2883,7 +2683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2893,7 +2692,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2904,7 +2702,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2914,7 +2711,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -2924,7 +2720,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2933,14 +2728,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'XcmPallet', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'XcmPallet', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -2950,7 +2744,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -2960,7 +2753,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -2969,7 +2761,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -2979,7 +2771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -3007,7 +2798,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -3042,7 +2832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -3072,7 +2861,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -3091,26 +2879,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3119,7 +2904,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -3129,7 +2914,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -3144,7 +2928,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -3163,13 +2946,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -3183,7 +2965,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RcMigrator`'s events
@@ -3193,7 +2975,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'StageTransition',
       {
@@ -3217,7 +2998,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -3226,13 +3007,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * A query response has been received.
      **/
     QueryResponseReceived: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'QueryResponseReceived',
       {
@@ -3252,7 +3032,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A XCM message has been resent.
      **/
     XcmResendAttempt: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmResendAttempt',
       {
@@ -3272,7 +3051,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The unprocessed message buffer size has been set.
      **/
     UnprocessedMsgBufferSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'UnprocessedMsgBufferSet',
       {
@@ -3292,7 +3070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Whether the AH UMP queue was prioritized for the next block.
      **/
     AhUmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePrioritySet',
       {
@@ -3319,7 +3096,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The AH UMP queue priority config was set.
      **/
     AhUmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePriorityConfigSet',
       {
@@ -3339,7 +3115,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The total issuance was recorded.
      **/
     MigratedBalanceRecordSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceRecordSet',
       { kept: bigint; migrated: bigint }
@@ -3349,7 +3124,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The RC kept balance was consumed.
      **/
     MigratedBalanceConsumed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceConsumed',
       { kept: bigint; migrated: bigint }
@@ -3359,7 +3133,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerSet',
       {
@@ -3379,7 +3152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmSent',
       {
@@ -3393,13 +3165,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The staking elections were paused.
      **/
-    StakingElectionsPaused: GenericPalletEvent<Rv, 'RcMigrator', 'StakingElectionsPaused', null>;
+    StakingElectionsPaused: GenericPalletEvent<'RcMigrator', 'StakingElectionsPaused', null>;
 
     /**
      * The accounts to be preserved on Relay Chain were set.
      **/
     AccountsPreserved: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AccountsPreserved',
       {
@@ -3414,7 +3185,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The canceller account id was set.
      **/
     CancellerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'CancellerSet',
       {
@@ -3434,7 +3204,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The migration was paused.
      **/
     MigrationPaused: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigrationPaused',
       {
@@ -3448,13 +3217,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The migration was cancelled.
      **/
-    MigrationCancelled: GenericPalletEvent<Rv, 'RcMigrator', 'MigrationCancelled', null>;
+    MigrationCancelled: GenericPalletEvent<'RcMigrator', 'MigrationCancelled', null>;
 
     /**
      * Some pure accounts were indexed for possibly receiving free `Any` proxies.
      **/
     PureAccountsIndexed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'PureAccountsIndexed',
       {
@@ -3469,7 +3237,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager multisig dispatched something.
      **/
     ManagerMultisigDispatched: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerMultisigDispatched',
       { res: Result<[], DispatchError> }
@@ -3478,11 +3245,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The manager multisig received a vote.
      **/
-    ManagerMultisigVoted: GenericPalletEvent<Rv, 'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
+    ManagerMultisigVoted: GenericPalletEvent<'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/paseo/index.d.ts b/packages/chaintypes/src/paseo/index.d.ts
index 554dab5e..38ccef2f 100644
--- a/packages/chaintypes/src/paseo/index.d.ts
+++ b/packages/chaintypes/src/paseo/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PaseoRuntimeRuntimeCall,
@@ -43,26 +43,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PolkadotRuntimeCommonClaimsPrevalidateAttests,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPaseoApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: PaseoApi
- * @specVersion: 1009003
+ * @specVersion: 2000001
  **/
-export interface PaseoApi {
-  legacy: VersionedPaseoApi<RpcLegacy>;
-  v2: VersionedPaseoApi<RpcV2>;
+export interface PaseoApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/paseo/json-rpc.d.ts b/packages/chaintypes/src/paseo/json-rpc.d.ts
index e84f3571..c021a2b3 100644
--- a/packages/chaintypes/src/paseo/json-rpc.d.ts
+++ b/packages/chaintypes/src/paseo/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -103,4 +103,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/paseo/query.d.ts b/packages/chaintypes/src/paseo/query.d.ts
index 35decffe..cc725126 100644
--- a/packages/chaintypes/src/paseo/query.d.ts
+++ b/packages/chaintypes/src/paseo/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -155,7 +155,7 @@ import type {
   PaseoRuntimeRuntimeCallLike,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -166,35 +166,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -202,7 +202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -210,28 +210,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -244,14 +244,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -268,21 +268,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -290,21 +290,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -317,12 +317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -333,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -341,7 +341,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -349,11 +349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -364,12 +360,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -383,7 +379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -391,19 +387,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -414,14 +410,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -429,14 +425,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -452,28 +448,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -488,7 +484,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -496,7 +492,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -504,7 +500,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -514,7 +510,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -525,7 +521,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -536,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -544,7 +540,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -552,7 +548,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -566,12 +562,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -582,7 +578,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -592,12 +588,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -609,12 +605,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -625,14 +621,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -663,7 +659,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -674,7 +670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -684,7 +680,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -692,7 +688,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -701,7 +697,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -709,7 +704,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -719,18 +714,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -741,12 +736,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -757,14 +752,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -773,7 +768,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -783,28 +778,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -813,7 +808,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -824,7 +819,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -834,7 +829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -844,14 +839,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -860,7 +855,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -886,14 +881,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -906,14 +901,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -922,7 +917,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -932,7 +927,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -942,7 +937,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -953,7 +948,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -968,7 +963,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -988,7 +983,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -1015,7 +1009,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -1032,7 +1025,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -1048,7 +1040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -1061,7 +1053,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1074,7 +1065,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1083,7 +1074,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1092,14 +1083,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1108,7 +1099,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1117,7 +1108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1125,7 +1116,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1133,7 +1124,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1143,7 +1134,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1153,7 +1144,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1165,7 +1155,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1177,7 +1166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1190,7 +1178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1202,7 +1189,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1211,12 +1198,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -1228,7 +1215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -1237,7 +1224,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -1245,7 +1231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -1257,19 +1243,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1280,14 +1266,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1295,7 +1281,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1303,7 +1289,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PaseoRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PaseoRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PaseoRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1314,7 +1300,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1322,7 +1308,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PaseoRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => PaseoRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PaseoRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1331,7 +1317,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1339,7 +1324,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1350,28 +1335,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1379,7 +1364,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1396,19 +1381,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -1419,19 +1404,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1445,7 +1430,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1456,14 +1441,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1473,14 +1458,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1488,19 +1473,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1514,7 +1499,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1527,12 +1511,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1543,7 +1527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1551,7 +1535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1562,7 +1546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1570,7 +1554,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1583,12 +1567,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1599,12 +1583,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1615,13 +1599,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -1632,11 +1616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -1645,7 +1625,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -1656,12 +1635,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1673,11 +1652,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -1686,12 +1661,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1704,11 +1679,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1716,16 +1687,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1738,7 +1705,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1746,7 +1712,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -1757,7 +1723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -1765,7 +1731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -1773,19 +1739,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -1797,7 +1763,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -1806,7 +1772,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -1814,7 +1780,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -1823,7 +1789,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -1836,7 +1801,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -1848,7 +1813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -1856,12 +1821,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -1877,14 +1842,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -1893,7 +1858,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -1903,7 +1868,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -1913,7 +1878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -1923,7 +1888,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -1938,7 +1903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -1950,7 +1915,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -1965,7 +1930,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -1978,12 +1942,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -1997,14 +1961,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2014,7 +1978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2022,7 +1986,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2032,12 +1996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2052,14 +2016,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2072,7 +2036,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2080,7 +2044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2088,7 +2052,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2096,7 +2060,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2105,7 +2069,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2116,7 +2080,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2126,7 +2089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2134,14 +2097,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2150,14 +2113,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2166,14 +2129,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2181,21 +2144,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2206,14 +2169,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2221,16 +2184,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -2243,7 +2202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -2253,14 +2212,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -2274,12 +2233,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2295,7 +2254,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2305,7 +2263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2313,23 +2271,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingAhClient`'s storage queries
@@ -2342,17 +2296,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    validatorSet: GenericStorageQuery<Rv, () => [number, Array<AccountId32>] | undefined>;
+    validatorSet: GenericStorageQuery<() => [number, Array<AccountId32>] | undefined>;
 
     /**
      * An incomplete validator set report.
      *
      * @param {Callback<PalletStakingAsyncRcClientValidatorSetReport | undefined> =} callback
      **/
-    incompleteValidatorSetReport: GenericStorageQuery<
-      Rv,
-      () => PalletStakingAsyncRcClientValidatorSetReport | undefined
-    >;
+    incompleteValidatorSetReport: GenericStorageQuery<() => PalletStakingAsyncRcClientValidatorSetReport | undefined>;
 
     /**
      * All of the points of the validators.
@@ -2363,7 +2314,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    validatorPoints: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    validatorPoints: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Indicates the current operating mode of the pallet.
@@ -2373,7 +2324,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncAhClientOperatingMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletStakingAsyncAhClientOperatingMode>;
+    mode: GenericStorageQuery<() => PalletStakingAsyncAhClientOperatingMode>;
 
     /**
      * A storage value that is set when a `new_session` gives a new validator set to the session
@@ -2387,7 +2338,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextSessionChangesValidators: GenericStorageQuery<Rv, () => number | undefined>;
+    nextSessionChangesValidators: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The session index at which the latest elected validator set was applied.
@@ -2397,7 +2348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetAppliedAt: GenericStorageQuery<Rv, () => number | undefined>;
+    validatorSetAppliedAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A session report that is outgoing, and should be sent.
@@ -2407,7 +2358,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientSessionReport, number] | undefined> =} callback
      **/
-    outgoingSessionReport: GenericStorageQuery<Rv, () => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
+    outgoingSessionReport: GenericStorageQuery<() => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
 
     /**
      * Internal storage item of [`OffenceSendQueue`]. Should not be used manually.
@@ -2416,7 +2367,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, PalletStakingAsyncRcClientOffence]>> =} callback
      **/
     offenceSendQueueOffences: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<[number, PalletStakingAsyncRcClientOffence]>,
       number
     >;
@@ -2426,12 +2376,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    offenceSendQueueCursor: GenericStorageQuery<Rv, () => number>;
+    offenceSendQueueCursor: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Configuration`'s storage queries
@@ -2442,7 +2392,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsConfigurationHostConfiguration> =} callback
      **/
-    activeConfig: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
+    activeConfig: GenericStorageQuery<() => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
 
     /**
      * Pending configuration changes.
@@ -2455,10 +2405,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>> =} callback
      **/
-    pendingConfigs: GenericStorageQuery<
-      Rv,
-      () => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>
-    >;
+    pendingConfigs: GenericStorageQuery<() => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>>;
 
     /**
      * If this is set, then the configuration setters will bypass the consistency checks. This
@@ -2466,12 +2413,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    bypassConsistencyCheck: GenericStorageQuery<Rv, () => boolean>;
+    bypassConsistencyCheck: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasShared`'s storage queries
@@ -2482,7 +2429,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * All the validators actively participating in parachain consensus.
@@ -2490,7 +2437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex>> =} callback
      **/
-    activeValidatorIndices: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorIndex>>;
+    activeValidatorIndices: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorIndex>>;
 
     /**
      * The parachain attestation keys of the validators actively participating in parachain
@@ -2498,19 +2445,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorAppPublic>> =} callback
      **/
-    activeValidatorKeys: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
+    activeValidatorKeys: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
 
     /**
      * All allowed relay-parents.
      *
      * @param {Callback<PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker> =} callback
      **/
-    allowedRelayParents: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
+    allowedRelayParents: GenericStorageQuery<() => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInclusion`'s storage queries
@@ -2527,7 +2474,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined> =} callback
      **/
     v1: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined,
@@ -2537,7 +2483,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInherent`'s storage queries
@@ -2553,19 +2499,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    included: GenericStorageQuery<Rv, () => [] | undefined>;
+    included: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Scraped on chain data for extracting resolved disputes as well as backing votes.
      *
      * @param {Callback<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined> =} callback
      **/
-    onChainVotes: GenericStorageQuery<Rv, () => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
+    onChainVotes: GenericStorageQuery<() => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaScheduler`'s storage queries
@@ -2582,7 +2528,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Array<PolkadotPrimitivesV8ValidatorIndex>>> =} callback
      **/
-    validatorGroups: GenericStorageQuery<Rv, () => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    validatorGroups: GenericStorageQuery<() => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * The block number where the session start occurred. Used to track how many group rotations
@@ -2595,7 +2541,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    sessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * One entry for each availability core. The `VecDeque` represents the assignments to be
@@ -2604,14 +2550,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>> =} callback
      **/
     claimQueue: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Paras`'s storage queries
@@ -2627,7 +2572,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined> =} callback
      **/
     pvfActiveVoteMap: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined,
@@ -2639,7 +2583,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>> =} callback
      **/
-    pvfActiveVoteList: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
+    pvfActiveVoteList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
 
     /**
      * All lease holding parachains. Ordered ascending by `ParaId`. On demand parachains are not
@@ -2649,7 +2593,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachains: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The current lifecycle of a all known Para IDs.
@@ -2658,7 +2602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaLifecycle | undefined> =} callback
      **/
     paraLifecycles: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaLifecycle | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2670,7 +2613,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesHeadData | undefined> =} callback
      **/
     heads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesHeadData | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2682,7 +2624,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     mostRecentContext: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2696,7 +2637,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     currentCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2713,7 +2653,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     pastCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: [PolkadotParachainPrimitivesPrimitivesId, number],
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2729,7 +2668,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaPastCodeMeta> =} callback
      **/
     pastCodeMeta: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaPastCodeMeta,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2744,7 +2682,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    pastCodePruning: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    pastCodePruning: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The block number at which the planned code change is expected for a parachain.
@@ -2756,7 +2694,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     futureCodeUpgrades: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2773,7 +2710,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    futureCodeUpgradesAt: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    futureCodeUpgradesAt: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actual future code hash of a para.
@@ -2784,7 +2721,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     futureCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2798,7 +2734,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined> =} callback
      **/
     authorizedCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined,
@@ -2821,7 +2756,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
     upgradeGoAheadSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeGoAhead | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2841,7 +2775,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
     upgradeRestrictionSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeRestriction | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2853,7 +2786,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upgradeCooldowns: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upgradeCooldowns: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The list of upcoming code upgrades.
@@ -2865,7 +2798,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upcomingUpgrades: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upcomingUpgrades: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actions to perform during the start of a specific session index.
@@ -2873,7 +2806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    actionsQueue: GenericStorageQuery<Rv, (arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
+    actionsQueue: GenericStorageQuery<(arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
 
     /**
      * Upcoming paras instantiation arguments.
@@ -2885,7 +2818,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaGenesisArgs | undefined> =} callback
      **/
     upcomingParasGenesis: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaGenesisArgs | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2897,7 +2829,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     codeByHashRefs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => number,
       PolkadotParachainPrimitivesPrimitivesValidationCodeHash
     >;
@@ -2912,7 +2843,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined> =} callback
      **/
     codeByHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCode | undefined,
@@ -2922,7 +2852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Initializer`'s storage queries
@@ -2940,7 +2870,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    hasInitialized: GenericStorageQuery<Rv, () => [] | undefined>;
+    hasInitialized: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Buffered session changes.
@@ -2953,15 +2883,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>> =} callback
      **/
-    bufferedSessionChanges: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>
-    >;
+    bufferedSessionChanges: GenericStorageQuery<() => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dmp`'s storage queries
@@ -2974,7 +2901,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundDownwardMessage>> =} callback
      **/
     downwardMessageQueues: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotCorePrimitivesInboundDownwardMessage>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2992,7 +2918,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256> =} callback
      **/
     downwardMessageQueueHeads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => H256,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3004,7 +2929,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3012,7 +2936,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hrmp`'s storage queries
@@ -3030,7 +2954,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined> =} callback
      **/
     hrmpOpenChannelRequests: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
       ) => PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined,
@@ -3041,10 +2964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpOpenChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpOpenChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * This mapping tracks how many open channel requests are initiated by a given sender para.
@@ -3055,7 +2975,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpOpenChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3069,7 +2988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpAcceptedChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3087,7 +3005,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     hrmpCloseChannelRequests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => [] | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3096,10 +3013,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpCloseChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpCloseChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * The HRMP watermark associated with each para.
@@ -3111,7 +3025,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     hrmpWatermarks: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3125,7 +3038,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpChannel | undefined> =} callback
      **/
     hrmpChannels: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => PolkadotRuntimeParachainsHrmpHrmpChannel | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3149,7 +3061,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpIngressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3160,7 +3071,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpEgressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3173,7 +3083,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundHrmpMessage>> =} callback
      **/
     hrmpChannelContents: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => Array<PolkadotCorePrimitivesInboundHrmpMessage>,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3190,7 +3099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>> =} callback
      **/
     hrmpChannelDigests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3198,7 +3106,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaSessionInfo`'s storage queries
@@ -3211,14 +3119,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8AssignmentAppPublic>> =} callback
      **/
-    assignmentKeysUnsafe: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
+    assignmentKeysUnsafe: GenericStorageQuery<() => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
 
     /**
      * The earliest session for which previous session info is stored.
      *
      * @param {Callback<number> =} callback
      **/
-    earliestStoredSession: GenericStorageQuery<Rv, () => number>;
+    earliestStoredSession: GenericStorageQuery<() => number>;
 
     /**
      * Session information in a rolling window.
@@ -3228,7 +3136,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8SessionInfo | undefined> =} callback
      **/
-    sessions: GenericStorageQuery<Rv, (arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
+    sessions: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
 
     /**
      * The validator account keys of the validators actively participating in parachain consensus.
@@ -3236,7 +3144,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
-    accountKeys: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32> | undefined, number>;
+    accountKeys: GenericStorageQuery<(arg: number) => Array<AccountId32> | undefined, number>;
 
     /**
      * Executor parameter set for a given session index
@@ -3244,16 +3152,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8ExecutorParams | undefined> =} callback
      **/
-    sessionExecutorParams: GenericStorageQuery<
-      Rv,
-      (arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined,
-      number
-    >;
+    sessionExecutorParams: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasDisputes`'s storage queries
@@ -3265,7 +3169,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastPrunedSession: GenericStorageQuery<Rv, () => number | undefined>;
+    lastPrunedSession: GenericStorageQuery<() => number | undefined>;
 
     /**
      * All ongoing or concluded disputes for the last several sessions.
@@ -3274,7 +3178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8DisputeState | undefined> =} callback
      **/
     disputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesV8DisputeState | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3287,7 +3190,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex> | undefined> =} callback
      **/
     backersOnDisputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => Array<PolkadotPrimitivesV8ValidatorIndex> | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3300,7 +3202,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     included: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => number | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3313,12 +3214,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    frozen: GenericStorageQuery<Rv, () => number | undefined>;
+    frozen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasSlashing`'s storage queries
@@ -3331,7 +3232,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesVstagingPendingSlashes | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesVstagingPendingSlashes | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3342,12 +3242,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetCounts: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    validatorSetCounts: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OnDemand`'s storage queries
@@ -3362,7 +3262,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined> =} callback
      **/
     paraIdAffinity: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined,
@@ -3374,14 +3273,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesQueueStatusType> =} callback
      **/
-    queueStatus: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
+    queueStatus: GenericStorageQuery<() => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
 
     /**
      * Priority queue for all orders which don't yet (or not any more) have any core affinity.
      *
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
-    freeEntries: GenericStorageQuery<Rv, () => BinaryHeapEnqueuedOrder>;
+    freeEntries: GenericStorageQuery<() => BinaryHeapEnqueuedOrder>;
 
     /**
      * Queue entries that are currently bound to a particular core due to core affinity.
@@ -3390,7 +3289,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
     affinityEntries: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => BinaryHeapEnqueuedOrder,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3400,7 +3298,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<bigint>> =} callback
      **/
-    revenue: GenericStorageQuery<Rv, () => Array<bigint>>;
+    revenue: GenericStorageQuery<() => Array<bigint>>;
 
     /**
      * Keeps track of credits owned by each account.
@@ -3408,12 +3306,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    credits: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    credits: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s storage queries
@@ -3429,7 +3327,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined> =} callback
      **/
     coreSchedules: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotPrimitivesV8CoreIndex]) => PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined,
       [number, PolkadotPrimitivesV8CoreIndex]
     >;
@@ -3444,7 +3341,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor> =} callback
      **/
     coreDescriptors: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3452,7 +3348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Registrar`'s storage queries
@@ -3465,7 +3361,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId | undefined> =} callback
      **/
     pendingSwap: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesId | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3480,7 +3375,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonParasRegistrarParaInfo | undefined> =} callback
      **/
     paras: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonParasRegistrarParaInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3490,12 +3384,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    nextFreeParaId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    nextFreeParaId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Slots`'s storage queries
@@ -3523,7 +3417,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint] | undefined>> =} callback
      **/
     leases: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[AccountId32, bigint] | undefined>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3531,7 +3424,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Auctions`'s storage queries
@@ -3542,7 +3435,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    auctionCounter: GenericStorageQuery<Rv, () => number>;
+    auctionCounter: GenericStorageQuery<() => number>;
 
     /**
      * Information relating to the current auction, if there is one.
@@ -3553,7 +3446,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    auctionInfo: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    auctionInfo: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Amounts currently reserved in the accounts of the bidders currently winning
@@ -3563,7 +3456,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     reservedAmounts: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PolkadotParachainPrimitivesPrimitivesId]) => bigint | undefined,
       [AccountId32, PolkadotParachainPrimitivesPrimitivesId]
     >;
@@ -3577,7 +3469,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined> =} callback
      **/
     winning: GenericStorageQuery<
-      Rv,
       (
         arg: number,
       ) => FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined,
@@ -3587,7 +3478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Crowdloan`'s storage queries
@@ -3600,7 +3491,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonCrowdloanFundInfo | undefined> =} callback
      **/
     funds: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonCrowdloanFundInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3611,26 +3501,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    newRaise: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    newRaise: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The number of auctions that have entered into their ending period so far.
      *
      * @param {Callback<number> =} callback
      **/
-    endingsCount: GenericStorageQuery<Rv, () => number>;
+    endingsCount: GenericStorageQuery<() => number>;
 
     /**
      * Tracker for the next available fund index
      *
      * @param {Callback<number> =} callback
      **/
-    nextFundIndex: GenericStorageQuery<Rv, () => number>;
+    nextFundIndex: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -3644,7 +3534,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -3653,7 +3543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -3662,12 +3552,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmPallet`'s storage queries
@@ -3678,7 +3568,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -3686,7 +3576,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -3697,7 +3587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -3705,7 +3595,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -3714,7 +3604,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3726,7 +3615,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3739,7 +3627,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3751,14 +3638,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -3767,7 +3654,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -3779,7 +3665,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -3789,7 +3674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -3802,7 +3687,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -3814,7 +3699,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -3825,7 +3710,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -3833,7 +3717,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -3846,7 +3730,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin) => PalletMessageQueueBookState,
       PolkadotRuntimeParachainsInclusionAggregateMessageOrigin
     >;
@@ -3856,7 +3739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -3865,7 +3748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]
     >;
@@ -3873,7 +3755,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3888,7 +3770,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3896,7 +3777,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -3907,21 +3788,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -3938,7 +3819,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -3947,12 +3828,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -3963,14 +3844,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -3981,12 +3862,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BeefyMmrLeaf`'s storage queries
@@ -3997,7 +3878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -4006,12 +3887,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -4022,12 +3903,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RcMigrator`'s storage queries
@@ -4038,7 +3919,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorMigrationStage> =} callback
      **/
-    rcMigrationStage: GenericStorageQuery<Rv, () => PalletRcMigratorMigrationStage>;
+    rcMigrationStage: GenericStorageQuery<() => PalletRcMigratorMigrationStage>;
 
     /**
      * Helper storage item to obtain and store the known accounts that should be kept partially or
@@ -4048,7 +3929,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRcMigratorAccountsAccountState | undefined> =} callback
      **/
     rcAccounts: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletRcMigratorAccountsAccountState | undefined,
       AccountId32
     >;
@@ -4058,14 +3938,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRcAccounts: GenericStorageQuery<Rv, () => number>;
+    counterForRcAccounts: GenericStorageQuery<() => number>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain.
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalance: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalance: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain after
@@ -4077,7 +3957,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalanceArchive: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalanceArchive: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * The pending XCM messages.
@@ -4089,14 +3969,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    pendingXcmMessages: GenericStorageQuery<Rv, (arg: H256) => StagingXcmV5Xcm | undefined, H256>;
+    pendingXcmMessages: GenericStorageQuery<(arg: H256) => StagingXcmV5Xcm | undefined, H256>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingXcmMessages: GenericStorageQuery<Rv, () => number>;
+    counterForPendingXcmMessages: GenericStorageQuery<() => number>;
 
     /**
      * Accounts that use the proxy pallet to delegate permissions and have no nonce.
@@ -4106,7 +3986,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    pureProxyCandidatesMigrated: GenericStorageQuery<Rv, (arg: AccountId32Like) => boolean | undefined, AccountId32>;
+    pureProxyCandidatesMigrated: GenericStorageQuery<(arg: AccountId32Like) => boolean | undefined, AccountId32>;
 
     /**
      * The pending XCM response queries and their XCM hash referencing the message in the
@@ -4120,14 +4000,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pendingXcmQueries: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    pendingXcmQueries: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Manual override for `type UnprocessedMsgBuffer: Get<u32>`. Look there for docs.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    unprocessedMsgBuffer: GenericStorageQuery<Rv, () => number | undefined>;
+    unprocessedMsgBuffer: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The priority of the Asset Hub UMP queue during migration.
@@ -4139,7 +4019,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    ahUmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    ahUmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -4149,7 +4029,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * An optional account id of a canceller.
@@ -4158,7 +4038,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    canceller: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    canceller: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -4168,7 +4048,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -4178,7 +4058,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The duration of the pre migration warm-up period.
@@ -4188,7 +4068,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    warmUpPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    warmUpPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      * The duration of the post migration cool-off period.
@@ -4199,7 +4079,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    coolOffPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    coolOffPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      *
@@ -4207,7 +4087,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<SpRuntimeMultiSigner>> =} callback
      **/
     managerMultisigs: GenericStorageQuery<
-      Rv,
       (arg: PaseoRuntimeRuntimeCallLike) => Array<SpRuntimeMultiSigner>,
       PaseoRuntimeRuntimeCall
     >;
@@ -4216,11 +4095,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    managerMultisigRound: GenericStorageQuery<Rv, () => number>;
+    managerMultisigRound: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/paseo/runtime.d.ts b/packages/chaintypes/src/paseo/runtime.d.ts
index a78dc19d..019679fe 100644
--- a/packages/chaintypes/src/paseo/runtime.d.ts
+++ b/packages/chaintypes/src/paseo/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -74,6 +74,8 @@ import type {
   SpConsensusSlotsEquivocationProof,
   SpAuthorityDiscoveryAppPublic,
   SpCoreCryptoKeyTypeId,
+  FrameSupportViewFunctionsViewFunctionDispatchError,
+  FrameSupportViewFunctionsViewFunctionId,
   PalletTransactionPaymentRuntimeDispatchInfo,
   PalletTransactionPaymentFeeDetails,
   SpWeightsWeightV2Weight,
@@ -90,7 +92,7 @@ import type {
   XcmRuntimeApisConversionsError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Inflation - 0xc51ff1fa3f5d0cca
    **/
@@ -103,12 +105,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Inflation_experimental_inflation_prediction_info
      **/
-    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<Rv, () => Promise<RelayCommonApisInflationInfo>>;
+    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<() => Promise<RelayCommonApisInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -119,7 +121,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -127,7 +129,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -135,12 +137,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -151,7 +153,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -162,7 +164,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -171,12 +173,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -192,7 +194,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -203,7 +204,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -212,7 +213,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -224,14 +224,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -243,7 +242,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -252,7 +251,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -261,7 +260,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -269,7 +268,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -280,7 +279,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -295,7 +294,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -309,7 +308,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -317,7 +316,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -325,7 +324,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -333,12 +332,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -350,7 +349,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -359,7 +358,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -368,12 +367,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -396,7 +395,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -409,7 +407,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -421,12 +419,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ParachainHost - 0xaf2c0297a23e6d3d
@@ -437,7 +435,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validators
      **/
-    validators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
+    validators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
 
     /**
      * Returns the validator groups and rotation info localized based on the hypothetical child
@@ -447,7 +445,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_validator_groups
      **/
     validatorGroups: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<[Array<Array<PolkadotPrimitivesV8ValidatorIndex>>, PolkadotPrimitivesV8GroupRotationInfo]>
     >;
 
@@ -457,7 +454,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_availability_cores
      **/
-    availabilityCores: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
+    availabilityCores: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
 
     /**
      * Yields the persisted validation data for the given `ParaId` along with an assumption that
@@ -471,7 +468,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     persistedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -488,7 +484,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} expected_persisted_validation_data_hash
      **/
     assumedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         expectedPersistedValidationDataHash: H256,
@@ -506,7 +501,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8CandidateCommitments} outputs
      **/
     checkValidationOutputs: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         outputs: PolkadotPrimitivesV8CandidateCommitments,
@@ -520,7 +514,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_session_index_for_child
      **/
-    sessionIndexForChild: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    sessionIndexForChild: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Fetch the validation code used by a para, making the given `OccupiedCoreAssumption`.
@@ -533,7 +527,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCode: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -548,7 +541,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatePendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2 | undefined>
@@ -559,7 +551,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_candidate_events
      **/
-    candidateEvents: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
+    candidateEvents: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
 
     /**
      * Get all the pending inbound messages in the downward message queue for a para.
@@ -568,7 +560,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     dmqContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotCorePrimitivesInboundDownwardMessage>>
@@ -582,7 +573,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     inboundHrmpChannelsContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<[PolkadotParachainPrimitivesPrimitivesId, Array<PolkadotCorePrimitivesInboundHrmpMessage>]>>
@@ -595,7 +585,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} hash
      **/
     validationCodeByHash: GenericRuntimeApiMethod<
-      Rv,
       (
         hash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => Promise<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined>
@@ -606,7 +595,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_on_chain_votes
      **/
-    onChainVotes: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
+    onChainVotes: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
 
     /**
      * Get the session info for the given session, if stored.
@@ -616,7 +605,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_session_info
      * @param {number} index
      **/
-    sessionInfo: GenericRuntimeApiMethod<Rv, (index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
+    sessionInfo: GenericRuntimeApiMethod<(index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
 
     /**
      * Submits a PVF pre-checking statement into the transaction pool.
@@ -628,7 +617,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     submitPvfCheckStatement: GenericRuntimeApiMethod<
-      Rv,
       (stmt: PolkadotPrimitivesV8PvfCheckStatement, signature: PolkadotPrimitivesV8ValidatorAppSignature) => Promise<[]>
     >;
 
@@ -640,7 +628,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_pvfs_require_precheck
      **/
     pvfsRequirePrecheck: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>
     >;
 
@@ -654,7 +641,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCodeHash: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -667,7 +653,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_disputes
      **/
     disputes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8DisputeState]>>
     >;
 
@@ -678,7 +663,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session_index
      **/
     sessionExecutorParams: GenericRuntimeApiMethod<
-      Rv,
       (sessionIndex: number) => Promise<PolkadotPrimitivesV8ExecutorParams | undefined>
     >;
 
@@ -689,7 +673,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_unapplied_slashes
      **/
     unappliedSlashes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8SlashingPendingSlashes]>>
     >;
 
@@ -701,7 +684,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppPublic} validator_id
      **/
     keyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         validatorId: PolkadotPrimitivesV8ValidatorAppPublic,
       ) => Promise<PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof | undefined>
@@ -717,7 +699,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof} key_ownership_proof
      **/
     submitReportDisputeLost: GenericRuntimeApiMethod<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesV8SlashingDisputeProof,
         keyOwnershipProof: PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof,
@@ -730,7 +711,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_minimum_backing_votes
      **/
-    minimumBackingVotes: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    minimumBackingVotes: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the state of parachain backing for a given para.
@@ -739,7 +720,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} __runtime_api_generated_name_0__
      **/
     paraBackingState: GenericRuntimeApiMethod<
-      Rv,
       (
         runtimeApiGeneratedName0: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingBackingState | undefined>
@@ -750,14 +730,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_async_backing_params
      **/
-    asyncBackingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
+    asyncBackingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
 
     /**
      * Returns a list of all disabled validators at the given block.
      *
      * @callname: ParachainHost_disabled_validators
      **/
-    disabledValidators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    disabledValidators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * Get node features.
@@ -765,14 +745,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_node_features
      **/
-    nodeFeatures: GenericRuntimeApiMethod<Rv, () => Promise<BitSequence>>;
+    nodeFeatures: GenericRuntimeApiMethod<() => Promise<BitSequence>>;
 
     /**
      * Approval voting configuration parameters
      *
      * @callname: ParachainHost_approval_voting_params
      **/
-    approvalVotingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
+    approvalVotingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
 
     /**
      * Claim queue
@@ -780,7 +760,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_claim_queue
      **/
     claimQueue: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotParachainPrimitivesPrimitivesId>]>>
     >;
 
@@ -791,7 +770,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatesPendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2>>
@@ -802,7 +780,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validation_code_bomb_limit
      **/
-    validationCodeBombLimit: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    validationCodeBombLimit: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the constraints on the actions that can be taken by a new parachain
@@ -812,7 +790,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     backingConstraints: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingConstraints | undefined>
@@ -823,12 +800,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_scheduling_lookahead
      **/
-    schedulingLookahead: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    schedulingLookahead: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyApi - 0x49eaaf1b548a0cb0
@@ -839,14 +816,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyApi_beefy_genesis
      **/
-    beefyGenesis: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    beefyGenesis: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Return the current active BEEFY validator set
      *
      * @callname: BeefyApi_validator_set
      **/
-    validatorSet: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyValidatorSet | undefined>>;
+    validatorSet: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyValidatorSet | undefined>>;
 
     /**
      * Submits an unsigned extrinsic to report a double voting equivocation. The caller
@@ -863,7 +840,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportDoubleVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -885,7 +861,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportForkVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProofOpaqueValue,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -907,7 +882,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportFutureBlockVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -932,7 +906,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBeefyEcdsaCryptoPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusBeefyEcdsaCryptoPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -945,14 +918,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateAncestryProof: GenericRuntimeApiMethod<
-      Rv,
       (prevBlockNumber: number, bestKnownBlockNumber?: number | undefined) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MmrApi - 0x91d5df18b0d2cf58
@@ -963,14 +935,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MmrApi_mmr_root
      **/
-    mmrRoot: GenericRuntimeApiMethod<Rv, () => Promise<Result<H256, SpMmrPrimitivesError>>>;
+    mmrRoot: GenericRuntimeApiMethod<() => Promise<Result<H256, SpMmrPrimitivesError>>>;
 
     /**
      * Return the number of MMR blocks in the chain.
      *
      * @callname: MmrApi_mmr_leaf_count
      **/
-    mmrLeafCount: GenericRuntimeApiMethod<Rv, () => Promise<Result<bigint, SpMmrPrimitivesError>>>;
+    mmrLeafCount: GenericRuntimeApiMethod<() => Promise<Result<bigint, SpMmrPrimitivesError>>>;
 
     /**
      * Generate MMR proof for a series of block numbers. If `best_known_block_number = Some(n)`,
@@ -981,7 +953,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateProof: GenericRuntimeApiMethod<
-      Rv,
       (
         blockNumbers: Array<number>,
         bestKnownBlockNumber?: number | undefined,
@@ -1000,7 +971,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProof: GenericRuntimeApiMethod<
-      Rv,
       (
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
         proof: SpMmrPrimitivesLeafProof,
@@ -1022,7 +992,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProofStateless: GenericRuntimeApiMethod<
-      Rv,
       (
         root: H256,
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
@@ -1033,7 +1002,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyMmrApi - 0x2a5e924655399e60
@@ -1044,19 +1013,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyMmrApi_authority_set_proof
      **/
-    authoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    authoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Return the next/queued BEEFY authority set proof.
      *
      * @callname: BeefyMmrApi_next_authority_set_proof
      **/
-    nextAuthoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    nextAuthoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -1072,7 +1041,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -1089,7 +1058,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -1114,7 +1082,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -1123,12 +1090,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
@@ -1139,21 +1106,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -1161,7 +1128,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -1181,7 +1148,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -1203,7 +1169,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -1213,7 +1178,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -1224,12 +1189,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -1247,7 +1212,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -1258,14 +1223,36 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
+  };
+  /**
+   * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
+   **/
+  runtimeViewFunction: {
+    /**
+     * Execute a view function query.
+     *
+     * @callname: RuntimeViewFunction_execute_view_function
+     * @param {FrameSupportViewFunctionsViewFunctionId} query_id
+     * @param {BytesLike} input
+     **/
+    executeViewFunction: GenericRuntimeApiMethod<
+      (
+        queryId: FrameSupportViewFunctionsViewFunctionId,
+        input: BytesLike,
+      ) => Promise<Result<Bytes, FrameSupportViewFunctionsViewFunctionDispatchError>>
+    >;
+
+    /**
+     * Generic runtime api call
+     **/
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -1277,12 +1264,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -1295,7 +1282,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1306,7 +1292,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1315,19 +1300,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -1341,7 +1326,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1353,7 +1337,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PaseoRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1363,7 +1346,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -1371,12 +1354,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -1393,7 +1376,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -1408,7 +1390,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -1425,7 +1406,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -1444,7 +1424,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -1454,7 +1433,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -1469,7 +1448,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PaseoRuntimeOriginCaller,
         call: PaseoRuntimeRuntimeCallLike,
@@ -1485,7 +1463,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -1495,7 +1472,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -1508,14 +1485,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1536,7 +1512,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1557,7 +1533,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1567,11 +1543,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/paseo/tx.d.ts b/packages/chaintypes/src/paseo/tx.d.ts
index bbe12e72..0b811a73 100644
--- a/packages/chaintypes/src/paseo/tx.d.ts
+++ b/packages/chaintypes/src/paseo/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -104,16 +102,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PaseoRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PaseoRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -126,16 +126,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -145,16 +144,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -164,16 +162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -186,16 +183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -205,16 +201,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -224,16 +219,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -247,19 +241,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -269,16 +262,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -291,16 +283,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -317,16 +308,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -344,23 +334,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -375,14 +364,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -394,7 +381,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -405,19 +393,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -431,7 +418,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -439,7 +425,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -452,7 +437,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -462,16 +448,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -484,14 +469,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -503,7 +486,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -517,7 +501,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -525,7 +508,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -538,7 +520,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -561,20 +544,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -597,20 +579,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -620,16 +601,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -639,23 +619,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -670,16 +649,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -694,16 +672,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -716,16 +693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -737,16 +713,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -758,23 +733,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -790,19 +764,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -820,19 +793,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -845,23 +817,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -891,23 +862,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -930,16 +900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -961,19 +930,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -994,16 +962,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1027,20 +994,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1061,16 +1027,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1089,23 +1054,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -1124,19 +1088,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1149,20 +1112,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1178,19 +1140,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1215,19 +1176,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1240,19 +1200,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1269,16 +1228,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1291,19 +1249,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1318,19 +1275,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1347,26 +1303,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -1394,19 +1349,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1429,16 +1383,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1468,16 +1421,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1509,16 +1461,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1532,16 +1483,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1560,16 +1510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1587,15 +1536,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1616,16 +1564,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1647,15 +1594,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1670,16 +1616,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1695,16 +1640,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1720,16 +1664,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1750,15 +1693,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1780,15 +1722,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1800,16 +1741,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1827,19 +1767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1856,15 +1795,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1880,19 +1818,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1915,19 +1852,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1943,16 +1879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1980,19 +1915,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2012,16 +1946,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2053,7 +1986,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -2063,7 +1995,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2078,7 +2009,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2113,16 +2045,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2134,16 +2065,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2156,16 +2086,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2193,20 +2122,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2221,16 +2149,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2246,16 +2173,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2278,14 +2204,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2297,7 +2221,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2313,16 +2238,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2354,27 +2278,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} slashFraction
      **/
     manualSlash: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         slashFraction: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ManualSlash';
             params: { validatorStash: AccountId32Like; era: number; slashFraction: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2395,19 +2318,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PaseoRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PaseoRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2427,22 +2349,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -2458,19 +2379,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2489,19 +2409,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2523,26 +2442,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -2571,19 +2489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2613,16 +2530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2660,14 +2576,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: XcmVersionedLocation,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -2679,7 +2593,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2709,16 +2624,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2748,16 +2662,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2782,23 +2695,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -2819,19 +2731,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2866,14 +2777,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -2885,7 +2794,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2908,16 +2818,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2936,19 +2845,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2987,19 +2895,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3026,27 +2933,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -3068,13 +2974,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: PaseoRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -3085,7 +2989,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3102,16 +3007,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3127,16 +3031,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3151,16 +3054,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3175,16 +3077,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3197,16 +3098,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3224,16 +3124,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3249,16 +3148,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3275,26 +3173,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -3305,16 +3202,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3323,16 +3219,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3343,20 +3238,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3365,23 +3259,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: PaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -3417,19 +3310,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3456,14 +3348,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3475,7 +3365,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3513,13 +3404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3530,7 +3419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3558,16 +3448,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3578,27 +3467,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -3617,15 +3505,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3645,16 +3532,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3677,19 +3563,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3714,20 +3599,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3758,19 +3642,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3786,26 +3669,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -3834,16 +3716,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PaseoRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3866,19 +3747,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3900,16 +3780,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PaseoRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3925,19 +3804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PaseoRuntimeOriginCaller,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PaseoRuntimeOriginCaller; call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3959,16 +3837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PaseoRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PaseoRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PaseoRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3984,19 +3861,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4029,19 +3905,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PaseoRuntimeRuntimeCallLike,
         fallback: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PaseoRuntimeRuntimeCallLike; fallback: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4056,26 +3931,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PaseoRuntimeOriginCaller,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PaseoRuntimeOriginCaller; call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -4097,13 +3971,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PaseoRuntimeConstantsProxyProxyType | undefined,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4114,7 +3986,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4134,20 +4007,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PaseoRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PaseoRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4165,20 +4037,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PaseoRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PaseoRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4192,15 +4063,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4229,20 +4099,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PaseoRuntimeConstantsProxyProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PaseoRuntimeConstantsProxyProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4271,7 +4140,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PaseoRuntimeConstantsProxyProxyType,
@@ -4279,7 +4147,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4292,7 +4159,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4317,19 +4185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4349,19 +4216,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4381,19 +4247,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4416,14 +4281,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PaseoRuntimeConstantsProxyProxyType | undefined,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4435,7 +4298,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PaseoRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4451,22 +4315,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -4490,19 +4353,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4554,7 +4416,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4562,7 +4423,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PaseoRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4575,7 +4435,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4618,7 +4479,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4626,7 +4486,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4639,7 +4498,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4672,14 +4532,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4691,7 +4549,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4715,27 +4574,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -4759,19 +4617,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4787,16 +4644,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4813,20 +4669,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4852,16 +4707,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4877,16 +4731,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4906,19 +4759,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4935,16 +4787,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4962,16 +4813,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4990,19 +4840,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5024,20 +4873,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5061,23 +4909,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -5109,20 +4956,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5149,21 +4995,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5192,19 +5037,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5248,19 +5092,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5288,20 +5131,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5327,19 +5169,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5371,26 +5212,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -5416,12 +5256,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -5431,7 +5269,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5445,16 +5284,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5471,16 +5309,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5498,16 +5335,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5519,22 +5355,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -5555,16 +5390,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5583,16 +5417,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5605,26 +5438,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -5652,19 +5484,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5680,16 +5511,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5705,15 +5535,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5754,19 +5583,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5782,19 +5610,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5826,19 +5653,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5867,21 +5693,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5900,7 +5725,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -5908,7 +5732,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -5921,7 +5744,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5943,19 +5767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5975,19 +5798,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6001,19 +5823,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6038,7 +5859,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -6047,7 +5867,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6061,7 +5880,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6080,14 +5900,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6099,7 +5917,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6125,16 +5944,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6153,19 +5971,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6181,16 +5998,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6203,16 +6019,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6227,19 +6042,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6254,19 +6068,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6280,19 +6093,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6317,16 +6129,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6342,16 +6153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6365,19 +6175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6395,16 +6204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6422,16 +6230,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6449,23 +6256,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -6501,15 +6307,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6535,15 +6340,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6565,23 +6369,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingAhClient`'s transaction calls
@@ -6592,16 +6395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientValidatorSetReport} report
      **/
     validatorSet: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientValidatorSetReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ValidatorSet';
             params: { report: PalletStakingAsyncRcClientValidatorSetReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6611,16 +6413,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncAhClientOperatingMode} mode
      **/
     setMode: GenericTxCall<
-      Rv,
       (mode: PalletStakingAsyncAhClientOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'SetMode';
             params: { mode: PalletStakingAsyncAhClientOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6629,22 +6430,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnMigrationEnd: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ForceOnMigrationEnd';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Configuration`'s transaction calls
@@ -6656,16 +6456,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeCooldown: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeCooldown';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6675,16 +6474,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6694,16 +6492,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCodeRetentionPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCodeRetentionPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6713,16 +6510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxCodeSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxCodeSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6732,16 +6528,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxPovSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxPovSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6751,16 +6546,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxHeadDataSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxHeadDataSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6773,16 +6567,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCoretimeCores: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCoretimeCores';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6792,16 +6585,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setGroupRotationFrequency: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetGroupRotationFrequency';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6811,16 +6603,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setParasAvailabilityPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetParasAvailabilityPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6830,16 +6621,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setSchedulingLookahead: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulingLookahead';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6849,16 +6639,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidatorsPerCore: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidatorsPerCore';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6868,16 +6657,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidators: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidators';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6887,16 +6675,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6906,16 +6693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePostConclusionAcceptancePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePostConclusionAcceptancePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6926,16 +6712,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNoShowSlots: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNoShowSlots';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6945,16 +6730,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNDelayTranches: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNDelayTranches';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6964,16 +6748,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setZerothDelayTrancheWidth: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetZerothDelayTrancheWidth';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6983,16 +6766,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNeededApprovals: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNeededApprovals';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7002,16 +6784,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setRelayVrfModuloSamples: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetRelayVrfModuloSamples';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7021,16 +6802,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7041,16 +6821,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7060,16 +6839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxDownwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxDownwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7079,16 +6857,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7098,16 +6875,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7117,16 +6893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpOpenRequestTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpOpenRequestTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7136,16 +6911,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpSenderDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpSenderDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7156,16 +6930,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpRecipientDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpRecipientDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7175,16 +6948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxCapacity: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxCapacity';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7194,16 +6966,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxTotalSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxTotalSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7213,16 +6984,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainInboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainInboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7232,16 +7002,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7251,16 +7020,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainOutboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainOutboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7270,16 +7038,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7289,16 +7056,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setPvfVotingTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetPvfVotingTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7311,16 +7077,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7331,16 +7096,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} new_
      **/
     setBypassConsistencyCheck: GenericTxCall<
-      Rv,
       (new_: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetBypassConsistencyCheck';
             params: { new: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7350,16 +7114,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8AsyncBackingAsyncBackingParams} new_
      **/
     setAsyncBackingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetAsyncBackingParams';
             params: { new: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7369,16 +7132,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ExecutorParams} new_
      **/
     setExecutorParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ExecutorParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetExecutorParams';
             params: { new: PolkadotPrimitivesV8ExecutorParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7388,16 +7150,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setOnDemandBaseFee: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandBaseFee';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7407,16 +7168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandFeeVariability: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandFeeVariability';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7426,16 +7186,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setOnDemandQueueMaxSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandQueueMaxSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7445,16 +7204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandTargetQueueUtilization: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandTargetQueueUtilization';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7464,16 +7222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumBackingVotes: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumBackingVotes';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7484,19 +7241,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     setNodeFeature: GenericTxCall<
-      Rv,
       (
         index: number,
         value: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNodeFeature';
             params: { index: number; value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7506,16 +7262,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ApprovalVotingParams} new_
      **/
     setApprovalVotingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ApprovalVotingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetApprovalVotingParams';
             params: { new: PolkadotPrimitivesV8ApprovalVotingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7525,23 +7280,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8SchedulerParams} new_
      **/
     setSchedulerParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8SchedulerParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulerParams';
             params: { new: PolkadotPrimitivesV8SchedulerParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasShared`'s transaction calls
@@ -7550,7 +7304,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInclusion`'s transaction calls
@@ -7559,7 +7313,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInherent`'s transaction calls
@@ -7571,23 +7325,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesVstagingInherentData} data
      **/
     enter: GenericTxCall<
-      Rv,
       (data: PolkadotPrimitivesVstagingInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaInherent';
           palletCall: {
             name: 'Enter';
             params: { data: PolkadotPrimitivesVstagingInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Paras`'s transaction calls
@@ -7600,12 +7353,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     forceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7615,7 +7366,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7626,12 +7378,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceSetCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7641,7 +7391,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7653,13 +7404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} relayParentNumber
      **/
     forceScheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
         relayParentNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7670,7 +7419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               relayParentNumber: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7681,12 +7431,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceNoteNewHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7696,7 +7444,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7708,16 +7457,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     forceQueueAction: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceQueueAction';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7740,16 +7488,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     addTrustedValidationCode: GenericTxCall<
-      Rv,
       (validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'AddTrustedValidationCode';
             params: { validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7763,16 +7510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} validationCodeHash
      **/
     pokeUnusedValidationCode: GenericTxCall<
-      Rv,
       (validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'PokeUnusedValidationCode';
             params: { validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7784,12 +7530,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     includePvfCheckStatement: GenericTxCall<
-      Rv,
       (
         stmt: PolkadotPrimitivesV8PvfCheckStatement,
         signature: PolkadotPrimitivesV8ValidatorAppSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7799,7 +7543,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: PolkadotPrimitivesV8ValidatorAppSignature;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7810,19 +7555,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} context
      **/
     forceSetMostRecentContext: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         context: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceSetMostRecentContext';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; context: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7835,16 +7579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeUpgradeCooldown: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'RemoveUpgradeCooldown';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7866,13 +7609,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} validPeriod
      **/
     authorizeForceSetCurrentCodeHash: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
         validPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7883,7 +7624,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validPeriod: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7895,12 +7637,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     applyAuthorizedForceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7910,14 +7650,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Initializer`'s transaction calls
@@ -7931,23 +7672,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} upTo
      **/
     forceApprove: GenericTxCall<
-      Rv,
       (upTo: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Initializer';
           palletCall: {
             name: 'ForceApprove';
             params: { upTo: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Hrmp`'s transaction calls
@@ -7970,13 +7710,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposedMaxMessageSize
      **/
     hrmpInitOpenChannel: GenericTxCall<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         proposedMaxCapacity: number,
         proposedMaxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -7987,7 +7725,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proposedMaxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7999,16 +7738,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} sender
      **/
     hrmpAcceptOpenChannel: GenericTxCall<
-      Rv,
       (sender: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpAcceptOpenChannel';
             params: { sender: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8021,16 +7759,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHrmpChannelId} channelId
      **/
     hrmpCloseChannel: GenericTxCall<
-      Rv,
       (channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCloseChannel';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8048,20 +7785,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numOutbound
      **/
     forceCleanHrmp: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         numInbound: number,
         numOutbound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceCleanHrmp';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; numInbound: number; numOutbound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8078,16 +7814,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpOpen: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpOpen';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8104,16 +7839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpClose: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpClose';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8131,19 +7865,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} openRequests
      **/
     hrmpCancelOpenRequest: GenericTxCall<
-      Rv,
       (
         channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
         openRequests: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCancelOpenRequest';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId; openRequests: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8163,14 +7896,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     forceOpenHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8182,7 +7913,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8204,12 +7936,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     establishSystemChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8219,7 +7949,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8238,12 +7969,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     pokeChannelDeposits: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8253,7 +7982,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8269,23 +7999,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} targetSystemChain
      **/
     establishChannelWithSystem: GenericTxCall<
-      Rv,
       (targetSystemChain: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'EstablishChannelWithSystem';
             params: { targetSystemChain: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasDisputes`'s transaction calls
@@ -8295,20 +8024,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceUnfreeze: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasDisputes';
           palletCall: 'ForceUnfreeze';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasSlashing`'s transaction calls
@@ -8320,26 +8048,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDisputeLostUnsigned: GenericTxCall<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesVstagingDisputeProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSlashing';
           palletCall: {
             name: 'ReportDisputeLostUnsigned';
             params: { disputeProof: PolkadotPrimitivesVstagingDisputeProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OnDemand`'s transaction calls
@@ -8368,19 +8095,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderAllowDeath: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderAllowDeath';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8407,19 +8133,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderKeepAlive: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderKeepAlive';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8446,26 +8171,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     placeOrderWithCredits: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderWithCredits';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Registrar`'s transaction calls
@@ -8498,13 +8222,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     register: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8515,7 +8237,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8534,7 +8257,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     forceRegister: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         deposit: bigint,
@@ -8542,7 +8264,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8555,7 +8276,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8568,16 +8290,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     deregister: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Deregister';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8599,19 +8320,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} other
      **/
     swap: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         other: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Swap';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; other: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8624,16 +8344,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'RemoveLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8658,15 +8377,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     reserve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Reserve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8680,16 +8398,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     addLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'AddLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8710,12 +8427,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     scheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8725,7 +8440,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8739,12 +8455,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     setCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8754,14 +8468,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Slots`'s transaction calls
@@ -8780,7 +8495,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} periodCount
      **/
     forceLease: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         leaser: AccountId32Like,
@@ -8788,7 +8502,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         periodBegin: number,
         periodCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
@@ -8801,7 +8514,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               periodCount: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8813,16 +8527,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     clearAllLeases: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'ClearAllLeases';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8838,23 +8551,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     triggerOnboard: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'TriggerOnboard';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Auctions`'s transaction calls
@@ -8871,19 +8583,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} leasePeriodIndex
      **/
     newAuction: GenericTxCall<
-      Rv,
       (
         duration: number,
         leasePeriodIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'NewAuction';
             params: { duration: number; leasePeriodIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8912,7 +8623,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     bid: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         auctionIndex: number,
@@ -8920,7 +8630,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         lastSlot: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
@@ -8933,7 +8642,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8944,22 +8654,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelAuction: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'CancelAuction';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Crowdloan`'s transaction calls
@@ -8980,7 +8689,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     create: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -8989,7 +8697,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9003,7 +8710,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9016,13 +8724,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contribute: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         value: bigint,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9033,7 +8739,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: SpRuntimeMultiSignature | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9060,19 +8767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         index: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Withdraw';
             params: { who: AccountId32Like; index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9086,16 +8792,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     refund: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Refund';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9105,16 +8810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     dissolve: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Dissolve';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9131,7 +8835,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     edit: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -9140,7 +8843,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9154,7 +8856,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9167,19 +8870,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} memo
      **/
     addMemo: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         memo: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'AddMemo';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; memo: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9191,16 +8893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     poke: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Poke';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9213,26 +8914,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contributeAll: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'ContributeAll';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Coretime`'s transaction calls
@@ -9249,16 +8949,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} count
      **/
     requestCoreCount: GenericTxCall<
-      Rv,
       (count: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestCoreCount';
             params: { count: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9271,16 +8970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     requestRevenueAt: GenericTxCall<
-      Rv,
       (when: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestRevenueAt';
             params: { when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9290,19 +8988,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     creditAccount: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'CreditAccount';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9323,7 +9020,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} endHint
      **/
     assignCore: GenericTxCall<
-      Rv,
       (
         core: number,
         begin: number,
@@ -9332,7 +9028,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         >,
         endHint: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
@@ -9346,14 +9041,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               endHint: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -9367,16 +9063,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9408,13 +9103,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -9425,7 +9118,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9439,19 +9133,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9468,20 +9161,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9491,16 +9183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9519,26 +9210,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmPallet`'s transaction calls
@@ -9550,19 +9240,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9594,14 +9283,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9613,7 +9300,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9657,14 +9345,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9676,7 +9362,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9694,19 +9381,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9722,19 +9408,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9748,16 +9433,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9770,16 +9454,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9794,16 +9477,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9846,7 +9528,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9854,7 +9535,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9867,7 +9547,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9898,7 +9579,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9906,7 +9586,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9919,7 +9598,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9932,16 +9612,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9987,7 +9666,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9995,7 +9673,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10008,7 +9685,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10024,19 +9702,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10099,7 +9776,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -10109,7 +9785,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10124,7 +9799,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10145,19 +9821,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10168,16 +9843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10187,22 +9861,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -10215,19 +9888,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10252,14 +9924,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -10271,14 +9941,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -10294,19 +9965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10320,19 +9990,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10345,23 +10014,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Beefy`'s transaction calls
@@ -10377,19 +10045,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVoting';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10408,19 +10075,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10433,16 +10099,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayInBlocks
      **/
     setNewGenesis: GenericTxCall<
-      Rv,
       (delayInBlocks: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'SetNewGenesis';
             params: { delayInBlocks: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10455,19 +10120,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVoting';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10485,19 +10149,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10510,12 +10173,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -10525,7 +10186,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10543,12 +10205,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -10558,14 +10218,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaSudoWrapper`'s transaction calls
@@ -10582,12 +10243,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeParachainsParasParaGenesisArgs} genesis
      **/
     sudoScheduleParaInitialize: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesis: PolkadotRuntimeParachainsParasParaGenesisArgs,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
@@ -10597,7 +10256,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               genesis: PolkadotRuntimeParachainsParasParaGenesisArgs;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10607,16 +10267,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParaCleanup: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParaCleanup';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10626,16 +10285,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParathreadUpgrade: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParathreadUpgrade';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10645,16 +10303,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParachainDowngrade: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParachainDowngrade';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10668,19 +10325,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} xcm
      **/
     sudoQueueDownwardXcm: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         xcm: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
             name: 'SudoQueueDownwardXcm';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; xcm: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10696,14 +10352,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     sudoEstablishHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaSudoWrapper';
           palletCall: {
@@ -10715,14 +10369,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -10734,16 +10389,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: PaseoRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10758,19 +10412,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: PaseoRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: PaseoRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10781,16 +10434,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10804,19 +10456,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PaseoRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: PaseoRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: PaseoRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10827,22 +10478,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RcMigrator`'s transaction calls
@@ -10857,16 +10507,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletRcMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletRcMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10899,14 +10548,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} unsafeIgnoreStakingLockCheck
      **/
     scheduleMigration: GenericTxCall<
-      Rv,
       (
         start: FrameSupportScheduleDispatchTime,
         warmUp: FrameSupportScheduleDispatchTime,
         coolOff: FrameSupportScheduleDispatchTime,
         unsafeIgnoreStakingLockCheck: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
@@ -10918,7 +10565,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               unsafeIgnoreStakingLockCheck: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10930,15 +10578,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startDataMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'StartDataMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10949,19 +10596,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Response} response
      **/
     receiveQueryResponse: GenericTxCall<
-      Rv,
       (
         queryId: bigint,
         response: StagingXcmV5Response,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ReceiveQueryResponse';
             params: { queryId: bigint; response: StagingXcmV5Response };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10971,16 +10617,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} queryId
      **/
     resendXcm: GenericTxCall<
-      Rv,
       (queryId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ResendXcm';
             params: { queryId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10992,16 +10637,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setUnprocessedMsgBuffer: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetUnprocessedMsgBuffer';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11013,16 +10657,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setAhUmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetAhUmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11035,16 +10678,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11057,19 +10699,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11081,16 +10722,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} accounts
      **/
     preserveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PreserveAccounts';
             params: { accounts: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11102,16 +10742,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setCanceller: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetCanceller';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11120,15 +10759,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pauseMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PauseMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11139,15 +10777,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'CancelMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11166,25 +10803,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature} sig
      **/
     voteManagerMultisig: GenericTxCall<
-      Rv,
       (
         payload: PalletRcMigratorManagerMultisigVote,
         sig: SpRuntimeMultiSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'VoteManagerMultisig';
             params: { payload: PalletRcMigratorManagerMultisigVote; sig: SpRuntimeMultiSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/paseo/types.d.ts b/packages/chaintypes/src/paseo/types.d.ts
index a8c5b229..e2144088 100644
--- a/packages/chaintypes/src/paseo/types.d.ts
+++ b/packages/chaintypes/src/paseo/types.d.ts
@@ -16624,6 +16624,13 @@ export type SpConsensusBabeEpoch = {
 
 export type SpConsensusBabeOpaqueKeyOwnershipProof = Bytes;
 
+export type FrameSupportViewFunctionsViewFunctionId = { prefix: FixedBytes<16>; suffix: FixedBytes<16> };
+
+export type FrameSupportViewFunctionsViewFunctionDispatchError =
+  | { type: 'NotImplemented' }
+  | { type: 'NotFound'; value: FrameSupportViewFunctionsViewFunctionId }
+  | { type: 'Codec' };
+
 export type PalletTransactionPaymentRuntimeDispatchInfo = {
   weight: SpWeightsWeightV2Weight;
   class: FrameSupportDispatchDispatchClass;
diff --git a/packages/chaintypes/src/paseo/view-functions.d.ts b/packages/chaintypes/src/paseo/view-functions.d.ts
index 088e5fa2..b4c35fd5 100644
--- a/packages/chaintypes/src/paseo/view-functions.d.ts
+++ b/packages/chaintypes/src/paseo/view-functions.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type {
   PaseoRuntimeRuntimeCallLike,
@@ -8,7 +8,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -20,7 +20,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PaseoRuntimeConstantsProxyProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PaseoRuntimeRuntimeCallLike, proxyType: PaseoRuntimeConstantsProxyProxyType) => Promise<boolean>
     >;
 
@@ -31,14 +30,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PaseoRuntimeConstantsProxyProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: PaseoRuntimeConstantsProxyProxyType, against: PaseoRuntimeConstantsProxyProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -55,12 +53,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `Paras`'s view functions
@@ -71,14 +69,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
-    removeUpgradeCooldownCost: GenericViewFunction<
-      Rv,
-      (para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>
-    >;
+    removeUpgradeCooldownCost: GenericViewFunction<(para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/consts.d.ts b/packages/chaintypes/src/polkadot-asset-hub/consts.d.ts
index fd8d0e50..b7aff5f3 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/consts.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Bytes, AccountId32, Permill, Perbill } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -15,7 +15,7 @@ import type {
   PalletReferendaTrackDetails,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/polkadot-asset-hub/errors.d.ts b/packages/chaintypes/src/polkadot-asset-hub/errors.d.ts
index 1e6425ad..b1b08aa3 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/errors.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,65 +11,65 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * The specified [`Task`] is not valid.
      **/
-    InvalidTask: GenericPalletError<Rv>;
+    InvalidTask: GenericPalletError;
 
     /**
      * The specified [`Task`] failed during execution.
      **/
-    FailedTask: GenericPalletError<Rv>;
+    FailedTask: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -78,38 +78,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -118,47 +118,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -167,32 +167,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -201,67 +201,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -270,33 +270,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -305,38 +305,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -345,92 +345,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -439,32 +439,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -473,32 +473,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -508,152 +508,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -663,32 +663,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -696,24 +696,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s errors
@@ -722,73 +722,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Convert versioned location failure
      **/
-    UnsupportedLocationVersion: GenericPalletError<Rv>;
+    UnsupportedLocationVersion: GenericPalletError;
 
     /**
      * Check location failure, should start from the dispatch origin as owner
      **/
-    InvalidAssetOwner: GenericPalletError<Rv>;
+    InvalidAssetOwner: GenericPalletError;
 
     /**
      * Send xcm message failure
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * Withdraw fee asset failure
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * Convert to reanchored location failure
      **/
-    LocationConversionFailed: GenericPalletError<Rv>;
+    LocationConversionFailed: GenericPalletError;
 
     /**
      * Message export is halted
      **/
-    Halted: GenericPalletError<Rv>;
+    Halted: GenericPalletError;
 
     /**
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The asset provided for the tip is unsupported.
      **/
-    UnsupportedAsset: GenericPalletError<Rv>;
+    UnsupportedAsset: GenericPalletError;
 
     /**
      * Unable to withdraw asset.
      **/
-    WithdrawError: GenericPalletError<Rv>;
+    WithdrawError: GenericPalletError;
 
     /**
      * Account could not be converted to a location.
      **/
-    InvalidAccount: GenericPalletError<Rv>;
+    InvalidAccount: GenericPalletError;
 
     /**
      * Provided tip asset could not be swapped for ether.
      **/
-    SwapError: GenericPalletError<Rv>;
+    SwapError: GenericPalletError;
 
     /**
      * Ether could not be burned.
      **/
-    BurnError: GenericPalletError<Rv>;
+    BurnError: GenericPalletError;
 
     /**
      * The tip provided is zero.
      **/
-    TipAmountZero: GenericPalletError<Rv>;
+    TipAmountZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -797,12 +797,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -811,78 +811,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -891,47 +891,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -940,32 +940,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -974,125 +974,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -1101,117 +1101,117 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * No metadata is found.
      **/
-    NoMetadata: GenericPalletError<Rv>;
+    NoMetadata: GenericPalletError;
 
     /**
      * Wrong metadata key/value bytes supplied.
      **/
-    WrongMetadata: GenericPalletError<Rv>;
+    WrongMetadata: GenericPalletError;
 
     /**
      * An attribute is not found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Wrong attribute key/value bytes supplied.
      **/
-    WrongAttribute: GenericPalletError<Rv>;
+    WrongAttribute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nfts`'s errors
@@ -1220,232 +1220,232 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The approval had a deadline that expired, so the approval isn't valid anymore.
      **/
-    ApprovalExpired: GenericPalletError<Rv>;
+    ApprovalExpired: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * The witness data given does not match the current state of the chain.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Collection ID is already taken.
      **/
-    CollectionIdInUse: GenericPalletError<Rv>;
+    CollectionIdInUse: GenericPalletError;
 
     /**
      * Items within that collection are non-transferable.
      **/
-    ItemsNonTransferable: GenericPalletError<Rv>;
+    ItemsNonTransferable: GenericPalletError;
 
     /**
      * The provided account is not a delegate.
      **/
-    NotDelegate: GenericPalletError<Rv>;
+    NotDelegate: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership acceptance of the collection.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked (non-transferable).
      **/
-    ItemLocked: GenericPalletError<Rv>;
+    ItemLocked: GenericPalletError;
 
     /**
      * Item's attributes are locked.
      **/
-    LockedItemAttributes: GenericPalletError<Rv>;
+    LockedItemAttributes: GenericPalletError;
 
     /**
      * Collection's attributes are locked.
      **/
-    LockedCollectionAttributes: GenericPalletError<Rv>;
+    LockedCollectionAttributes: GenericPalletError;
 
     /**
      * Item's metadata is locked.
      **/
-    LockedItemMetadata: GenericPalletError<Rv>;
+    LockedItemMetadata: GenericPalletError;
 
     /**
      * Collection's metadata is locked.
      **/
-    LockedCollectionMetadata: GenericPalletError<Rv>;
+    LockedCollectionMetadata: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply is locked and can't be changed.
      **/
-    MaxSupplyLocked: GenericPalletError<Rv>;
+    MaxSupplyLocked: GenericPalletError;
 
     /**
      * The provided max supply is less than the number of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Swap doesn't exist.
      **/
-    UnknownSwap: GenericPalletError<Rv>;
+    UnknownSwap: GenericPalletError;
 
     /**
      * The given item has no metadata set.
      **/
-    MetadataNotFound: GenericPalletError<Rv>;
+    MetadataNotFound: GenericPalletError;
 
     /**
      * The provided attribute can't be found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * The item has reached its approval limit.
      **/
-    ReachedApprovalLimit: GenericPalletError<Rv>;
+    ReachedApprovalLimit: GenericPalletError;
 
     /**
      * The deadline has already expired.
      **/
-    DeadlineExpired: GenericPalletError<Rv>;
+    DeadlineExpired: GenericPalletError;
 
     /**
      * The duration provided should be less than or equal to `MaxDeadlineDuration`.
      **/
-    WrongDuration: GenericPalletError<Rv>;
+    WrongDuration: GenericPalletError;
 
     /**
      * The method is disabled by system settings.
      **/
-    MethodDisabled: GenericPalletError<Rv>;
+    MethodDisabled: GenericPalletError;
 
     /**
      * The provided setting can't be set.
      **/
-    WrongSetting: GenericPalletError<Rv>;
+    WrongSetting: GenericPalletError;
 
     /**
      * Item's config already exists and should be equal to the provided one.
      **/
-    InconsistentItemConfig: GenericPalletError<Rv>;
+    InconsistentItemConfig: GenericPalletError;
 
     /**
      * Config for a collection or an item can't be found.
      **/
-    NoConfig: GenericPalletError<Rv>;
+    NoConfig: GenericPalletError;
 
     /**
      * Some roles were not cleared.
      **/
-    RolesNotCleared: GenericPalletError<Rv>;
+    RolesNotCleared: GenericPalletError;
 
     /**
      * Mint has not started yet.
      **/
-    MintNotStarted: GenericPalletError<Rv>;
+    MintNotStarted: GenericPalletError;
 
     /**
      * Mint has already ended.
      **/
-    MintEnded: GenericPalletError<Rv>;
+    MintEnded: GenericPalletError;
 
     /**
      * The provided Item was already used for claiming.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * The provided data is incorrect.
      **/
-    IncorrectData: GenericPalletError<Rv>;
+    IncorrectData: GenericPalletError;
 
     /**
      * The extrinsic was sent by the wrong origin.
      **/
-    WrongOrigin: GenericPalletError<Rv>;
+    WrongOrigin: GenericPalletError;
 
     /**
      * The provided signature is incorrect.
      **/
-    WrongSignature: GenericPalletError<Rv>;
+    WrongSignature: GenericPalletError;
 
     /**
      * The provided metadata might be too long.
      **/
-    IncorrectMetadata: GenericPalletError<Rv>;
+    IncorrectMetadata: GenericPalletError;
 
     /**
      * Can't set more attributes per one call.
      **/
-    MaxAttributesLimitReached: GenericPalletError<Rv>;
+    MaxAttributesLimitReached: GenericPalletError;
 
     /**
      * The provided namespace isn't supported in this call.
      **/
-    WrongNamespace: GenericPalletError<Rv>;
+    WrongNamespace: GenericPalletError;
 
     /**
      * Can't delete non-empty collections.
      **/
-    CollectionNotEmpty: GenericPalletError<Rv>;
+    CollectionNotEmpty: GenericPalletError;
 
     /**
      * The witness data should be provided.
      **/
-    WitnessRequired: GenericPalletError<Rv>;
+    WitnessRequired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ForeignAssets`'s errors
@@ -1454,125 +1454,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssets`'s errors
@@ -1581,125 +1581,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversion`'s errors
@@ -1708,125 +1708,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Pool already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Desired amount can't be zero.
      **/
-    WrongDesiredAmount: GenericPalletError<Rv>;
+    WrongDesiredAmount: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountOneLessThanMinimal: GenericPalletError<Rv>;
+    AmountOneLessThanMinimal: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountTwoLessThanMinimal: GenericPalletError<Rv>;
+    AmountTwoLessThanMinimal: GenericPalletError;
 
     /**
      * Reserve needs to always be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    ReserveLeftLessThanMinimal: GenericPalletError<Rv>;
+    ReserveLeftLessThanMinimal: GenericPalletError;
 
     /**
      * Desired amount can't be equal to the pool reserve.
      **/
-    AmountOutTooHigh: GenericPalletError<Rv>;
+    AmountOutTooHigh: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An overflow happened.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * Optimal calculated amount is less than desired.
      **/
-    OptimalAmountLessThanDesired: GenericPalletError<Rv>;
+    OptimalAmountLessThanDesired: GenericPalletError;
 
     /**
      * Insufficient liquidity minted.
      **/
-    InsufficientLiquidityMinted: GenericPalletError<Rv>;
+    InsufficientLiquidityMinted: GenericPalletError;
 
     /**
      * Requested liquidity can't be zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * Amount can't be zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Calculated amount out is less than provided minimum amount.
      **/
-    ProvidedMinimumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMinimumNotSufficientForSwap: GenericPalletError;
 
     /**
      * Provided maximum amount is not sufficient for swap.
      **/
-    ProvidedMaximumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMaximumNotSufficientForSwap: GenericPalletError;
 
     /**
      * The provided path must consists of 2 assets at least.
      **/
-    InvalidPath: GenericPalletError<Rv>;
+    InvalidPath: GenericPalletError;
 
     /**
      * The provided path must consists of unique assets.
      **/
-    NonUniquePath: GenericPalletError<Rv>;
+    NonUniquePath: GenericPalletError;
 
     /**
      * It was not possible to get or increment the Id of the pool.
      **/
-    IncorrectPoolAssetId: GenericPalletError<Rv>;
+    IncorrectPoolAssetId: GenericPalletError;
 
     /**
      * The destination account cannot exist with the swapped funds.
      **/
-    BelowMinimum: GenericPalletError<Rv>;
+    BelowMinimum: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -1835,63 +1835,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -1900,68 +1900,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1970,77 +1970,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -2049,32 +2049,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -2083,68 +2083,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -2153,22 +2153,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2177,22 +2177,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2201,7 +2201,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2212,32 +2212,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -2246,44 +2246,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -2292,160 +2292,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -2454,17 +2454,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -2473,17 +2473,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -2492,52 +2492,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElection`'s errors
@@ -2546,22 +2546,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Triggering the `Fallback` failed.
      **/
-    Fallback: GenericPalletError<Rv>;
+    Fallback: GenericPalletError;
 
     /**
      * Unexpected phase
      **/
-    UnexpectedPhase: GenericPalletError<Rv>;
+    UnexpectedPhase: GenericPalletError;
 
     /**
      * Snapshot was unavailable.
      **/
-    Snapshot: GenericPalletError<Rv>;
+    Snapshot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s errors
@@ -2570,52 +2570,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The phase is not signed.
      **/
-    PhaseNotSigned: GenericPalletError<Rv>;
+    PhaseNotSigned: GenericPalletError;
 
     /**
      * The submission is a duplicate.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * The queue is full.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The page index is out of bounds.
      **/
-    BadPageIndex: GenericPalletError<Rv>;
+    BadPageIndex: GenericPalletError;
 
     /**
      * The account is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * No submission found.
      **/
-    NoSubmission: GenericPalletError<Rv>;
+    NoSubmission: GenericPalletError;
 
     /**
      * Round is not yet over.
      **/
-    RoundNotOver: GenericPalletError<Rv>;
+    RoundNotOver: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitnessData: GenericPalletError<Rv>;
+    BadWitnessData: GenericPalletError;
 
     /**
      * Too many invulnerable accounts are provided,
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -2624,193 +2624,193 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record not found.
      **/
-    InvalidSlashRecord: GenericPalletError<Rv>;
+    InvalidSlashRecord: GenericPalletError;
 
     /**
      * Cannot bond, nominate or validate with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Era not yet started.
      **/
-    EraNotStarted: GenericPalletError<Rv>;
+    EraNotStarted: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Unapplied slashes in the recently concluded era is blocking this operation.
      * See `Call::apply_slash` to apply them.
      **/
-    UnappliedSlashesInPreviousEra: GenericPalletError<Rv>;
+    UnappliedSlashesInPreviousEra: GenericPalletError;
 
     /**
      * The era is not eligible for pruning.
      **/
-    EraNotPrunable: GenericPalletError<Rv>;
+    EraNotPrunable: GenericPalletError;
 
     /**
      * The slash has been cancelled and cannot be applied.
      **/
-    CancelledSlash: GenericPalletError<Rv>;
+    CancelledSlash: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhOps`'s errors
@@ -2819,62 +2819,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Either no lease deposit or already unreserved.
      **/
-    NoLeaseReserve: GenericPalletError<Rv>;
+    NoLeaseReserve: GenericPalletError;
 
     /**
      * Either no crowdloan contribution or already withdrawn.
      **/
-    NoCrowdloanContribution: GenericPalletError<Rv>;
+    NoCrowdloanContribution: GenericPalletError;
 
     /**
      * Either no crowdloan reserve or already unreserved.
      **/
-    NoCrowdloanReserve: GenericPalletError<Rv>;
+    NoCrowdloanReserve: GenericPalletError;
 
     /**
      * Failed to withdraw crowdloan contribution.
      **/
-    FailedToWithdrawCrowdloanContribution: GenericPalletError<Rv>;
+    FailedToWithdrawCrowdloanContribution: GenericPalletError;
 
     /**
      * Block number is not yet reached.
      **/
-    NotYet: GenericPalletError<Rv>;
+    NotYet: GenericPalletError;
 
     /**
      * Not all contributions are withdrawn.
      **/
-    ContributionsRemaining: GenericPalletError<Rv>;
+    ContributionsRemaining: GenericPalletError;
 
     /**
      * The account is not a derived account.
      **/
-    WrongDerivedTranslation: GenericPalletError<Rv>;
+    WrongDerivedTranslation: GenericPalletError;
 
     /**
      * Account cannot be migrated since it is not a sovereign parachain account.
      **/
-    NotSovereign: GenericPalletError<Rv>;
+    NotSovereign: GenericPalletError;
 
     /**
      * Internal error, please bug report.
      **/
-    InternalError: GenericPalletError<Rv>;
+    InternalError: GenericPalletError;
 
     /**
      * The Asset Hub migration is not completed.
      **/
-    MigrationNotCompleted: GenericPalletError<Rv>;
+    MigrationNotCompleted: GenericPalletError;
 
     /**
      * The balance is zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhMigrator`'s errors
@@ -2883,101 +2883,101 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to unreserve deposit.
      **/
-    FailedToUnreserveDeposit: GenericPalletError<Rv>;
+    FailedToUnreserveDeposit: GenericPalletError;
 
     /**
      * Failed to process an account data from RC.
      **/
-    FailedToProcessAccount: GenericPalletError<Rv>;
+    FailedToProcessAccount: GenericPalletError;
 
     /**
      * Some item could not be inserted because it already exists.
      **/
-    InsertConflict: GenericPalletError<Rv>;
+    InsertConflict: GenericPalletError;
 
     /**
      * Failed to convert RC type to AH type.
      **/
-    FailedToConvertType: GenericPalletError<Rv>;
+    FailedToConvertType: GenericPalletError;
 
     /**
      * Failed to fetch preimage.
      **/
-    PreimageNotFound: GenericPalletError<Rv>;
+    PreimageNotFound: GenericPalletError;
 
     /**
      * Failed to convert RC call to AH call.
      **/
-    FailedToConvertCall: GenericPalletError<Rv>;
+    FailedToConvertCall: GenericPalletError;
 
     /**
      * Failed to bound a call.
      **/
-    FailedToBoundCall: GenericPalletError<Rv>;
+    FailedToBoundCall: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to integrate a vesting schedule.
      **/
-    FailedToIntegrateVestingSchedule: GenericPalletError<Rv>;
+    FailedToIntegrateVestingSchedule: GenericPalletError;
 
     /**
      * Checking account overflow or underflow.
      **/
-    FailedToCalculateCheckingAccount: GenericPalletError<Rv>;
+    FailedToCalculateCheckingAccount: GenericPalletError;
 
     /**
      * Vector did not fit into its compile-time bound.
      **/
-    FailedToBoundVector: GenericPalletError<Rv>;
+    FailedToBoundVector: GenericPalletError;
 
     /**
      * The DMP queue priority is already set to the same value.
      **/
-    DmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    DmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * Preimage missing.
      **/
-    PreimageMissing: GenericPalletError<Rv>;
+    PreimageMissing: GenericPalletError;
 
     /**
      * Preimage too big.
      **/
-    PreimageTooBig: GenericPalletError<Rv>;
+    PreimageTooBig: GenericPalletError;
 
     /**
      * Preimage chunk missing.
      **/
-    PreimageChunkMissing: GenericPalletError<Rv>;
+    PreimageChunkMissing: GenericPalletError;
 
     /**
      * Preimage status invalid.
      **/
-    PreimageStatusInvalid: GenericPalletError<Rv>;
+    PreimageStatusInvalid: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/events.d.ts b/packages/chaintypes/src/polkadot-asset-hub/events.d.ts
index dba50273..447599b1 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/events.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -66,7 +66,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -74,18 +74,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -94,38 +88,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * A [`Task`] has started executing
      **/
-    TaskStarted: GenericPalletEvent<Rv, 'System', 'TaskStarted', { task: AssetHubPolkadotRuntimeRuntimeTask }>;
+    TaskStarted: GenericPalletEvent<'System', 'TaskStarted', { task: AssetHubPolkadotRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] has finished executing.
      **/
-    TaskCompleted: GenericPalletEvent<Rv, 'System', 'TaskCompleted', { task: AssetHubPolkadotRuntimeRuntimeTask }>;
+    TaskCompleted: GenericPalletEvent<'System', 'TaskCompleted', { task: AssetHubPolkadotRuntimeRuntimeTask }>;
 
     /**
      * A [`Task`] failed during execution.
      **/
     TaskFailed: GenericPalletEvent<
-      Rv,
       'System',
       'TaskFailed',
       { task: AssetHubPolkadotRuntimeRuntimeTask; err: DispatchError }
@@ -134,13 +127,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -149,7 +141,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -158,13 +150,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -173,18 +164,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -194,7 +184,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -203,7 +192,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -212,22 +201,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -236,18 +225,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -257,7 +245,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -267,7 +254,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -277,7 +263,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -287,7 +272,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -298,7 +282,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -308,7 +291,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -317,12 +299,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -334,7 +316,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -358,7 +339,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -367,40 +348,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -409,87 +389,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -500,7 +480,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -509,7 +488,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetTxPayment`'s events
@@ -520,7 +499,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who` in an asset `asset_id`.
      **/
     AssetTxFeePaid: GenericPalletEvent<
-      Rv,
       'AssetTxPayment',
       'AssetTxFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint; assetId: StagingXcmV5Location }
@@ -529,12 +507,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A swap of the refund in native currency back to asset failed.
      **/
-    AssetRefundFailed: GenericPalletEvent<Rv, 'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
+    AssetRefundFailed: GenericPalletEvent<'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -543,28 +521,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -574,7 +547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -583,7 +555,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -593,7 +565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -602,18 +573,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -622,13 +592,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -638,7 +607,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -647,13 +615,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -664,7 +631,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -673,7 +639,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -683,28 +649,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -713,12 +679,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -727,13 +693,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -748,7 +713,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -763,7 +727,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -775,7 +738,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -786,7 +748,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -797,7 +758,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -809,7 +769,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -826,7 +785,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -838,7 +796,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -850,7 +807,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -866,7 +822,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -875,13 +830,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -893,7 +847,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -904,7 +857,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -915,7 +867,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -926,7 +877,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -942,7 +892,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -954,7 +903,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -970,7 +918,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -980,7 +927,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -991,7 +937,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1001,7 +946,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -1011,7 +955,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1020,14 +963,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -1037,7 +979,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -1047,7 +988,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -1056,7 +996,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -1066,29 +1006,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s events
@@ -1098,7 +1033,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been decreased.
      **/
     DeliveryFeeFactorDecreased: GenericPalletEvent<
-      Rv,
       'ToKusamaXcmRouter',
       'DeliveryFeeFactorDecreased',
       {
@@ -1113,7 +1047,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been increased.
      **/
     DeliveryFeeFactorIncreased: GenericPalletEvent<
-      Rv,
       'ToKusamaXcmRouter',
       'DeliveryFeeFactorIncreased',
       {
@@ -1127,7 +1060,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -1137,7 +1070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -1165,7 +1097,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1200,7 +1131,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1230,7 +1160,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1249,7 +1178,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s events
@@ -1259,7 +1188,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM was sent
      **/
     MessageSent: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'MessageSent',
       {
@@ -1274,7 +1202,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set OperatingMode
      **/
     ExportOperatingModeChanged: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'ExportOperatingModeChanged',
       { mode: SnowbridgeCoreOperatingModeBasicOperatingMode }
@@ -1283,7 +1210,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1293,47 +1220,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1343,7 +1270,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1353,7 +1279,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1363,7 +1288,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1379,7 +1303,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1389,7 +1312,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1398,7 +1320,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1407,14 +1329,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: AssetHubPolkadotRuntimeProxyType; disambiguationIndex: number }
@@ -1424,7 +1345,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1438,13 +1358,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubPolkadotRuntimeProxyType; delay: number }
@@ -1454,7 +1373,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubPolkadotRuntimeProxyType; delay: number }
@@ -1464,7 +1382,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1473,7 +1390,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -1482,23 +1399,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -1507,7 +1423,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -1516,18 +1432,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -1536,13 +1451,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1551,33 +1465,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -1587,7 +1500,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -1596,23 +1508,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -1621,13 +1532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -1637,7 +1547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -1648,7 +1557,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -1657,13 +1565,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -1672,27 +1579,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -1701,33 +1608,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -1736,38 +1637,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: number; item: number }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: number; item: number }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: number; item: number }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: number; item: number }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: number }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: number }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: number }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1778,7 +1678,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1789,7 +1688,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1798,13 +1696,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: number }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: number; data: Bytes; isFrozen: boolean }
@@ -1813,13 +1710,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: number; item: number; data: Bytes; isFrozen: boolean }
@@ -1828,23 +1724,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: number; item: number }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: number; item: number }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: number; successfulItems: Array<number> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: number; maybeItem?: number | undefined; key: Bytes; value: Bytes }
@@ -1854,7 +1744,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes }
@@ -1864,7 +1753,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -1874,7 +1762,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -1884,7 +1771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -1893,13 +1779,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -1908,7 +1793,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nfts`'s events
@@ -1917,33 +1802,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Nfts', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Nfts', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Nfts', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Nfts',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -1952,23 +1831,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` became non-transferable.
      **/
-    ItemTransferLocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
+    ItemTransferLocked: GenericPalletEvent<'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
 
     /**
      * An `item` became transferable.
      **/
-    ItemTransferUnlocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
+    ItemTransferUnlocked: GenericPalletEvent<'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
 
     /**
      * `item` metadata or attributes were locked.
      **/
     ItemPropertiesLocked: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPropertiesLocked',
       { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean }
@@ -1977,18 +1855,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some `collection` was locked.
      **/
-    CollectionLocked: GenericPalletEvent<Rv, 'Nfts', 'CollectionLocked', { collection: number }>;
+    CollectionLocked: GenericPalletEvent<'Nfts', 'CollectionLocked', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TeamChanged',
       {
@@ -2004,7 +1881,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     TransferApproved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TransferApproved',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32; deadline?: number | undefined }
@@ -2015,7 +1891,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2025,7 +1900,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All approvals of an item got cancelled.
      **/
     AllApprovalsCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AllApprovalsCancelled',
       { collection: number; item: number; owner: AccountId32 }
@@ -2034,43 +1908,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its config changed by the `Force` origin.
      **/
-    CollectionConfigChanged: GenericPalletEvent<Rv, 'Nfts', 'CollectionConfigChanged', { collection: number }>;
+    CollectionConfigChanged: GenericPalletEvent<'Nfts', 'CollectionConfigChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
-    CollectionMetadataSet: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
+    CollectionMetadataSet: GenericPalletEvent<'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Nfts', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
-    ItemMetadataSet: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'ItemMetadataSet',
-      { collection: number; item: number; data: Bytes }
-    >;
+    ItemMetadataSet: GenericPalletEvent<'Nfts', 'ItemMetadataSet', { collection: number; item: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    ItemMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
+    ItemMetadataCleared: GenericPalletEvent<'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
 
     /**
      * The deposit for a set of `item`s within a `collection` has been updated.
      **/
-    Redeposited: GenericPalletEvent<Rv, 'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
+    Redeposited: GenericPalletEvent<'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeSet',
       {
@@ -2086,7 +1954,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes; namespace: PalletNftsAttributeNamespace }
@@ -2096,7 +1963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was added.
      **/
     ItemAttributesApprovalAdded: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalAdded',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2106,7 +1972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was removed.
      **/
     ItemAttributesApprovalRemoved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalRemoved',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2116,7 +1981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2126,7 +1990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2135,18 +1998,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Mint settings for a collection had changed.
      **/
-    CollectionMintSettingsUpdated: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'CollectionMintSettingsUpdated',
-      { collection: number }
-    >;
+    CollectionMintSettingsUpdated: GenericPalletEvent<'Nfts', 'CollectionMintSettingsUpdated', { collection: number }>;
 
     /**
      * Event gets emitted when the `NextCollectionId` gets incremented.
      **/
     NextCollectionIdIncremented: GenericPalletEvent<
-      Rv,
       'Nfts',
       'NextCollectionIdIncremented',
       { nextId?: number | undefined }
@@ -2156,7 +2013,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the item.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2165,13 +2021,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the item was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2181,7 +2036,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A tip was sent.
      **/
     TipSent: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TipSent',
       { collection: number; item: number; sender: AccountId32; receiver: AccountId32; amount: bigint }
@@ -2191,7 +2045,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An `item` swap intent was created.
      **/
     SwapCreated: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCreated',
       {
@@ -2208,7 +2061,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap was cancelled.
      **/
     SwapCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCancelled',
       {
@@ -2225,7 +2077,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap has been claimed.
      **/
     SwapClaimed: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapClaimed',
       {
@@ -2244,7 +2095,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New attributes have been set for an `item` of the `collection`.
      **/
     PreSignedAttributesSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PreSignedAttributesSet',
       { collection: number; item: number; namespace: PalletNftsAttributeNamespace }
@@ -2255,7 +2105,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * within that `collection`.
      **/
     PalletAttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PalletAttributeSet',
       { collection: number; item?: number | undefined; attribute: PalletNftsPalletAttributes; value: Bytes }
@@ -2264,7 +2113,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ForeignAssets`'s events
@@ -2274,7 +2123,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some asset class was created.
      **/
     Created: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Created',
       { assetId: StagingXcmV5Location; creator: AccountId32; owner: AccountId32 }
@@ -2284,7 +2132,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were issued.
      **/
     Issued: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Issued',
       { assetId: StagingXcmV5Location; owner: AccountId32; amount: bigint }
@@ -2294,7 +2141,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Transferred',
       { assetId: StagingXcmV5Location; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2304,7 +2150,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were destroyed.
      **/
     Burned: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Burned',
       { assetId: StagingXcmV5Location; owner: AccountId32; balance: bigint }
@@ -2314,7 +2159,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TeamChanged',
       { assetId: StagingXcmV5Location; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2324,7 +2168,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The owner changed.
      **/
     OwnerChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'OwnerChanged',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2333,28 +2176,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
+    AssetFrozen: GenericPalletEvent<'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
+    AssetThawed: GenericPalletEvent<'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AccountsDestroyed',
       { assetId: StagingXcmV5Location; accountsDestroyed: number; accountsRemaining: number }
@@ -2364,7 +2206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalsDestroyed',
       { assetId: StagingXcmV5Location; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2373,23 +2214,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'DestructionStarted',
-      { assetId: StagingXcmV5Location }
-    >;
+    DestructionStarted: GenericPalletEvent<'ForeignAssets', 'DestructionStarted', { assetId: StagingXcmV5Location }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
+    Destroyed: GenericPalletEvent<'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset class was force-created.
      **/
     ForceCreated: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ForceCreated',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2399,7 +2234,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'MetadataSet',
       { assetId: StagingXcmV5Location; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2408,13 +2242,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
+    MetadataCleared: GenericPalletEvent<'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovedTransfer',
       { assetId: StagingXcmV5Location; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2424,7 +2257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalCancelled',
       { assetId: StagingXcmV5Location; owner: AccountId32; delegate: AccountId32 }
@@ -2435,7 +2267,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TransferredApproved',
       {
@@ -2450,18 +2281,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'AssetStatusChanged',
-      { assetId: StagingXcmV5Location }
-    >;
+    AssetStatusChanged: GenericPalletEvent<'ForeignAssets', 'AssetStatusChanged', { assetId: StagingXcmV5Location }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AssetMinBalanceChanged',
       { assetId: StagingXcmV5Location; newMinBalance: bigint }
@@ -2471,7 +2296,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some account `who` was created with a deposit from `depositor`.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Touched',
       { assetId: StagingXcmV5Location; who: AccountId32; depositor: AccountId32 }
@@ -2480,13 +2304,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Deposited',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2496,7 +2319,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Withdrawn',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2505,7 +2327,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssets`'s events
@@ -2514,23 +2336,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Created',
-      { assetId: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'PoolAssets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2539,13 +2355,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2554,33 +2369,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'PoolAssets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'PoolAssets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'PoolAssets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'PoolAssets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2590,7 +2404,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2599,23 +2412,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'PoolAssets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'PoolAssets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'PoolAssets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'PoolAssets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2624,13 +2436,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'PoolAssets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'PoolAssets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2640,7 +2451,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2651,7 +2461,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2660,13 +2469,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2675,32 +2483,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Touched',
-      { assetId: number; who: AccountId32; depositor: AccountId32 }
-    >;
+    Touched: GenericPalletEvent<'PoolAssets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversion`'s events
@@ -2710,7 +2513,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `CreatePool` extrinsic will create this event.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'PoolCreated',
       {
@@ -2742,7 +2544,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `AddLiquidity` extrinsic will create this event.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityAdded',
       {
@@ -2787,7 +2588,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `RemoveLiquidity` extrinsic will create this event.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityRemoved',
       {
@@ -2838,7 +2638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and `SwapTokenForExactToken` will generate this event.
      **/
     SwapExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapExecuted',
       {
@@ -2874,7 +2673,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Assets have been converted from one to another.
      **/
     SwapCreditExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapCreditExecuted',
       {
@@ -2900,7 +2698,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool has been touched in order to fulfill operational requirements.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'Touched',
       {
@@ -2919,7 +2716,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -2928,38 +2725,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -2968,18 +2759,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -2995,28 +2780,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -3025,18 +2810,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -3046,7 +2830,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -3055,12 +2838,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -3070,7 +2853,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -3095,7 +2877,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -3120,7 +2901,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -3145,7 +2925,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -3165,7 +2944,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -3191,7 +2969,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -3202,7 +2979,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -3217,7 +2993,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -3237,7 +3012,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -3252,7 +3026,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -3272,7 +3045,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -3292,7 +3064,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -3312,7 +3083,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -3332,7 +3102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -3357,7 +3126,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -3377,7 +3145,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -3396,16 +3163,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -3414,7 +3180,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -3423,28 +3189,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -3453,38 +3218,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -3493,7 +3257,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -3502,13 +3266,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -3518,7 +3281,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -3527,31 +3289,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3560,7 +3319,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -3571,7 +3330,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -3580,22 +3338,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -3604,13 +3362,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -3619,12 +3376,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -3640,7 +3392,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -3655,7 +3406,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -3664,13 +3414,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -3684,7 +3433,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -3695,7 +3443,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -3704,13 +3451,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -3720,7 +3466,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -3730,7 +3475,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -3740,7 +3484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -3750,7 +3493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -3760,7 +3502,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -3770,7 +3511,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -3780,7 +3520,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -3790,7 +3529,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -3799,19 +3537,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -3821,7 +3553,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -3831,7 +3562,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -3847,7 +3577,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -3856,17 +3586,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -3876,7 +3606,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3886,7 +3615,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3896,7 +3624,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3906,7 +3633,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -3915,7 +3641,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingRcClient`'s events
@@ -3925,7 +3651,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A said session report was received.
      **/
     SessionReportReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'SessionReportReceived',
       {
@@ -3940,7 +3665,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new offence was reported.
      **/
     OffenceReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'OffenceReceived',
       { slashSession: number; offencesCount: number }
@@ -3950,12 +3674,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElection`'s events
@@ -3966,7 +3690,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * values.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'MultiBlockElection',
       'PhaseTransitioned',
       {
@@ -3985,22 +3708,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Target snapshot creation failed
      **/
-    UnexpectedTargetSnapshotFailed: GenericPalletEvent<
-      Rv,
-      'MultiBlockElection',
-      'UnexpectedTargetSnapshotFailed',
-      null
-    >;
+    UnexpectedTargetSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedTargetSnapshotFailed', null>;
 
     /**
      * Voter snapshot creation failed
      **/
-    UnexpectedVoterSnapshotFailed: GenericPalletEvent<Rv, 'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
+    UnexpectedVoterSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s events
@@ -4013,7 +3731,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was wrong, or the final checks of `finalize_verification` failed.
      **/
     VerificationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'VerificationFailed',
       [number, PalletElectionProviderMultiBlockVerifierFeasibilityError]
@@ -4023,13 +3740,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given page of a solution has been verified, with the given number of winners being
      * found in it.
      **/
-    Verified: GenericPalletEvent<Rv, 'MultiBlockElectionVerifier', 'Verified', [number, number]>;
+    Verified: GenericPalletEvent<'MultiBlockElectionVerifier', 'Verified', [number, number]>;
 
     /**
      * A solution with the given score has replaced our current best solution.
      **/
     Queued: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'Queued',
       [SpNposElectionsElectionScore, SpNposElectionsElectionScore | undefined]
@@ -4038,7 +3754,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s events
@@ -4048,7 +3764,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Upcoming submission has been registered for the given account, with the given score.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionSigned',
       'Registered',
       [number, AccountId32, SpNposElectionsElectionScore]
@@ -4057,37 +3772,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A page of solution solution with the given index has been stored for the given account.
      **/
-    Stored: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
+    Stored: GenericPalletEvent<'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
 
     /**
      * The given account has been rewarded with the given amount.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
+    Rewarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
 
     /**
      * The given account has been slashed with the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
+    Slashed: GenericPalletEvent<'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
 
     /**
      * The given solution, for the given round, was ejected.
      **/
-    Ejected: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
+    Ejected: GenericPalletEvent<'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
 
     /**
      * The given account has been discarded.
      **/
-    Discarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
+    Discarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
 
     /**
      * The given account has bailed.
      **/
-    Bailed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
+    Bailed: GenericPalletEvent<'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -4097,18 +3812,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingAsyncRewardDestination; amount: bigint }
@@ -4117,18 +3826,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -4136,40 +3840,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A subsequent event of `Withdrawn`, indicating that `stash` was fully removed from the
      * system.
      **/
-    StakerRemoved: GenericPalletEvent<Rv, 'Staking', 'StakerRemoved', { stash: AccountId32 }>;
+    StakerRemoved: GenericPalletEvent<'Staking', 'StakerRemoved', { stash: AccountId32 }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -4179,7 +3882,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingAsyncValidatorPrefs }
@@ -4188,29 +3890,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * A page from a multi-page election was fetched. A number of these are followed by
@@ -4224,7 +3921,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the overall election will continue.
      **/
     PagedElectionProceeded: GenericPalletEvent<
-      Rv,
       'Staking',
       'PagedElectionProceeded',
       { page: number; result: Result<number, number> }
@@ -4235,7 +3931,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * given era as been reported.
      **/
     OffenceReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceReported',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -4245,7 +3940,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An offence has been processed and the corresponding slash has been computed.
      **/
     SlashComputed: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashComputed',
       { offenceEra: number; slashEra: number; offender: AccountId32; page: number }
@@ -4254,7 +3948,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unapplied slash has been cancelled.
      **/
-    SlashCancelled: GenericPalletEvent<Rv, 'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
+    SlashCancelled: GenericPalletEvent<'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
 
     /**
      * Session change has been triggered.
@@ -4263,7 +3957,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * election is ongoing.
      **/
     SessionRotated: GenericPalletEvent<
-      Rv,
       'Staking',
       'SessionRotated',
       { startingSession: number; activeEra: number; plannedEra: number }
@@ -4273,13 +3966,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
 
     /**
      * An offence was reported that was too old to be processed, and thus was dropped.
      **/
     OffenceTooOld: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceTooOld',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -4288,12 +3980,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An old era with the given index was pruned.
      **/
-    EraPruned: GenericPalletEvent<Rv, 'Staking', 'EraPruned', { index: number }>;
+    EraPruned: GenericPalletEvent<'Staking', 'EraPruned', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhOps`'s events
@@ -4303,7 +3995,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some lease reserve could not be unreserved and needs manual cleanup.
      **/
     LeaseUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'LeaseUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4313,7 +4004,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some amount for a crowdloan reserve could not be unreserved and needs manual cleanup.
      **/
     CrowdloanUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'CrowdloanUnreserveRemaining',
       { depositor: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; remaining: bigint }
@@ -4324,7 +4014,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * representation.
      **/
     SovereignMigrated: GenericPalletEvent<
-      Rv,
       'AhOps',
       'SovereignMigrated',
       {
@@ -4353,7 +4042,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhMigrator`'s events
@@ -4363,7 +4052,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'StageTransition',
       {
@@ -4383,7 +4071,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We received a batch of messages that will be integrated into a pallet.
      **/
     BatchReceived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchReceived',
       { pallet: PalletAhMigratorPalletEventName; count: number }
@@ -4393,7 +4080,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We processed a batch of messages for this pallet.
      **/
     BatchProcessed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BatchProcessed',
       { pallet: PalletAhMigratorPalletEventName; countGood: number; countBad: number }
@@ -4407,7 +4093,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * easier to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -4416,13 +4102,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'AhMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'AhMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * Whether the DMP queue was prioritized for the next block.
      **/
     DmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePrioritySet',
       {
@@ -4449,7 +4134,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The DMP queue priority config was set.
      **/
     DmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'DmpQueuePriorityConfigSet',
       {
@@ -4469,7 +4153,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were recorded.
      **/
     BalancesBeforeRecordSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordSet',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4479,7 +4162,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The balances before the migration were consumed.
      **/
     BalancesBeforeRecordConsumed: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'BalancesBeforeRecordConsumed',
       { checkingAccount: bigint; totalIssuance: bigint }
@@ -4488,13 +4170,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A referendum was cancelled because it could not be mapped.
      **/
-    ReferendumCanceled: GenericPalletEvent<Rv, 'AhMigrator', 'ReferendumCanceled', { id: number }>;
+    ReferendumCanceled: GenericPalletEvent<'AhMigrator', 'ReferendumCanceled', { id: number }>;
 
     /**
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'ManagerSet',
       {
@@ -4510,13 +4191,11 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     AccountTranslatedParachainSovereign: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereign',
       { from: AccountId32; to: AccountId32 }
     >;
     AccountTranslatedParachainSovereignDerived: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'AccountTranslatedParachainSovereignDerived',
       { from: AccountId32; to: AccountId32; derivationIndex: number }
@@ -4526,7 +4205,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'XcmSent',
       {
@@ -4541,7 +4219,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Failed to unreserve a multisig deposit.
      **/
     FailedToUnreserveMultisigDeposit: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'FailedToUnreserveMultisigDeposit',
       {
@@ -4566,7 +4243,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Failed to unreserve a legacy status preimage deposit.
      **/
     FailedToUnreservePreimageDeposit: GenericPalletEvent<
-      Rv,
       'AhMigrator',
       'FailedToUnreservePreimageDeposit',
       {
@@ -4590,6 +4266,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/index.d.ts b/packages/chaintypes/src/polkadot-asset-hub/index.d.ts
index b71f59d4..35bee55b 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/index.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AssetHubPolkadotRuntimeRuntimeCall,
@@ -14,6 +14,7 @@ import type {
   FrameSystemExtensionsCheckWeight,
   PalletAssetConversionTxPaymentChargeAssetTxPayment,
   FrameMetadataHashExtensionCheckMetadataHash,
+  StagingXcmV5Location,
 } from './types.js';
 import { ChainConsts } from './consts.js';
 import { ChainStorage } from './query.js';
@@ -41,26 +42,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletAssetConversionTxPaymentChargeAssetTxPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPolkadotAssetHubApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: StagingXcmV5Location;
 }
 
 /**
  * @name: PolkadotAssetHubApi
  * @specVersion: 2000003
  **/
-export interface PolkadotAssetHubApi {
-  legacy: VersionedPolkadotAssetHubApi<RpcLegacy>;
-  v2: VersionedPolkadotAssetHubApi<RpcV2>;
+export interface PolkadotAssetHubApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/json-rpc.d.ts b/packages/chaintypes/src/polkadot-asset-hub/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/json-rpc.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/polkadot-asset-hub/query.d.ts b/packages/chaintypes/src/polkadot-asset-hub/query.d.ts
index 2ddc67ac..b216c5c5 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/query.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -140,7 +140,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -151,35 +151,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -187,7 +187,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -195,28 +195,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -229,14 +229,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -253,21 +253,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -275,21 +275,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -302,12 +302,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -323,7 +323,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -333,7 +333,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -347,7 +346,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -358,7 +357,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -367,14 +366,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -383,7 +382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -396,7 +395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -407,7 +406,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -419,7 +418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -433,7 +432,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -447,7 +445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -457,7 +455,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -468,7 +466,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -479,7 +476,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -489,7 +486,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -498,7 +494,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -508,7 +504,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -519,7 +514,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -528,21 +523,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -550,7 +545,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -558,7 +553,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -566,7 +561,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -575,12 +570,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -591,7 +586,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -601,12 +596,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -616,12 +611,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -635,7 +630,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -643,19 +638,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -666,7 +661,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -674,7 +669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -682,11 +677,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -697,12 +688,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -715,7 +706,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPolkadotRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: AssetHubPolkadotRuntimeRuntimeParametersKey) => AssetHubPolkadotRuntimeRuntimeParametersValue | undefined,
       AssetHubPolkadotRuntimeRuntimeParametersKey
     >;
@@ -723,7 +713,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -734,14 +724,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -772,7 +762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -783,7 +773,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -793,7 +783,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -802,7 +792,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>> =} callback
      **/
     holds: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>,
       AccountId32
     >;
@@ -814,7 +803,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -822,7 +810,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -832,18 +820,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -855,11 +843,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -868,12 +852,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -884,13 +868,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -901,11 +885,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -914,7 +894,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -925,12 +904,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -941,12 +920,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -957,7 +936,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -968,7 +947,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -976,7 +955,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -985,7 +964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -994,12 +973,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1010,14 +989,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1025,7 +1004,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1033,7 +1012,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AssetHubPolkadotRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubPolkadotRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubPolkadotRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1044,7 +1023,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1053,7 +1032,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPolkadotRuntimeSessionKeys | undefined> =} callback
      **/
     nextKeys: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => AssetHubPolkadotRuntimeSessionKeys | undefined,
       AccountId32
     >;
@@ -1065,7 +1043,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1073,7 +1050,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1084,7 +1061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraEd25519AppEd25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraEd25519AppEd25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraEd25519AppEd25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1093,12 +1070,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1113,7 +1090,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraEd25519AppEd25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraEd25519AppEd25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraEd25519AppEd25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -1123,12 +1100,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1146,7 +1123,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1158,7 +1135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1167,7 +1144,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1179,7 +1155,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1189,14 +1164,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1205,7 +1180,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1213,7 +1187,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1224,7 +1198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1232,7 +1206,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1243,7 +1217,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1251,7 +1225,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1260,7 +1234,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1272,7 +1245,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1285,7 +1257,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1297,14 +1268,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1313,7 +1284,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1325,7 +1295,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1335,7 +1304,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1348,7 +1317,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1360,7 +1329,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1371,7 +1340,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1379,7 +1347,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s storage queries
@@ -1396,12 +1364,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
+    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1414,7 +1382,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1424,7 +1391,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1433,7 +1400,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1441,7 +1407,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s storage queries
@@ -1452,12 +1418,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SnowbridgeCoreOperatingModeBasicOperatingMode> =} callback
      **/
-    exportOperatingMode: GenericStorageQuery<Rv, () => SnowbridgeCoreOperatingModeBasicOperatingMode>;
+    exportOperatingMode: GenericStorageQuery<() => SnowbridgeCoreOperatingModeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1470,7 +1436,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1478,7 +1443,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1492,7 +1457,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Array<PalletProxyProxyDefinitionProxyType>, bigint]> =} callback
      **/
     proxies: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [Array<PalletProxyProxyDefinitionProxyType>, bigint],
       AccountId32
     >;
@@ -1503,16 +1467,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -1524,12 +1484,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1541,7 +1501,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1550,7 +1510,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1564,7 +1523,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1575,7 +1533,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1590,12 +1548,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1607,7 +1565,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1615,7 +1573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1625,7 +1583,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1637,7 +1594,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1645,7 +1602,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1653,7 +1610,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1662,7 +1619,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -1674,7 +1630,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -1686,7 +1641,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1697,12 +1651,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1714,7 +1668,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1722,7 +1676,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1732,7 +1686,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1744,11 +1697,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1758,7 +1707,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -1769,7 +1717,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1777,7 +1725,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1786,7 +1734,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -1798,7 +1745,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -1812,7 +1758,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1823,7 +1768,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1831,7 +1776,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1839,11 +1784,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -1851,7 +1792,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1859,16 +1800,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1881,7 +1818,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
     asset: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletAssetsAssetDetails | undefined,
       StagingXcmV5Location
     >;
@@ -1893,7 +1829,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -1907,7 +1842,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [StagingXcmV5Location, AccountId32, AccountId32]
     >;
@@ -1918,7 +1852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {StagingXcmV5Location} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
+    metadata: GenericStorageQuery<(arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1933,12 +1867,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => StagingXcmV5Location | undefined>;
+    nextAssetId: GenericStorageQuery<() => StagingXcmV5Location | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -1950,7 +1884,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1959,7 +1893,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1973,7 +1906,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1984,7 +1916,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1999,12 +1931,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -2018,7 +1950,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, StagingXcmV5Location]) => PalletAssetConversionPoolInfo | undefined,
       [StagingXcmV5Location, StagingXcmV5Location]
     >;
@@ -2029,12 +1960,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2048,7 +1979,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2059,14 +1990,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2076,14 +2007,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -2091,19 +2022,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -2117,7 +2048,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -2130,12 +2060,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -2146,7 +2076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -2155,7 +2085,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferendaReferendumInfoOriginCaller | undefined> =} callback
      **/
     referendumInfoFor: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletReferendaReferendumInfoOriginCaller | undefined,
       number
     >;
@@ -2169,7 +2098,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -2177,7 +2106,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -2190,12 +2119,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -2206,12 +2135,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2222,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2230,7 +2159,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2238,19 +2167,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2262,7 +2191,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -2271,7 +2200,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -2279,7 +2208,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -2288,7 +2217,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -2301,7 +2229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -2313,7 +2241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -2321,12 +2249,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -2341,7 +2269,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -2349,7 +2276,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2363,7 +2290,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -2372,7 +2299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -2381,12 +2308,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2401,14 +2328,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2421,7 +2348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2429,7 +2356,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2437,7 +2364,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2445,7 +2372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2454,7 +2381,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2465,7 +2392,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2475,7 +2401,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2483,14 +2409,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2499,14 +2425,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2515,14 +2441,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2530,21 +2456,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2555,14 +2481,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2570,16 +2496,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2593,14 +2515,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2610,7 +2532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2618,7 +2540,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2628,12 +2550,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2649,7 +2571,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2659,7 +2580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2667,23 +2588,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRcClient`'s storage queries
@@ -2694,7 +2611,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncRcClientSessionReport | undefined> =} callback
      **/
-    incompleteSessionReport: GenericStorageQuery<Rv, () => PalletStakingAsyncRcClientSessionReport | undefined>;
+    incompleteSessionReport: GenericStorageQuery<() => PalletStakingAsyncRcClientSessionReport | undefined>;
 
     /**
      * The last session report's `end_index` that we have acted upon.
@@ -2708,7 +2625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSessionReportEndingIndex: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSessionReportEndingIndex: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A validator set that is outgoing, and should be sent.
@@ -2718,15 +2635,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientValidatorSetReport, number] | undefined> =} callback
      **/
-    outgoingValidatorSet: GenericStorageQuery<
-      Rv,
-      () => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined
-    >;
+    outgoingValidatorSet: GenericStorageQuery<() => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElection`'s storage queries
@@ -2742,14 +2656,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiBlockPhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockPhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiBlockPhase>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -2757,7 +2671,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    desiredTargets: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Paginated voter snapshot. At most [`T::Pages`] keys will exist.
@@ -2766,7 +2680,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint, Array<AccountId32>]> | undefined> =} callback
      **/
     pagedVoterSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<[AccountId32, bigint, Array<AccountId32>]> | undefined,
       [number, number]
     >;
@@ -2779,7 +2692,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedVoterSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedVoterSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Paginated target snapshot.
@@ -2790,7 +2703,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
     pagedTargetSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<AccountId32> | undefined,
       [number, number]
     >;
@@ -2803,12 +2715,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedTargetSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedTargetSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s storage queries
@@ -2827,7 +2739,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionX: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2839,7 +2750,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionY: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2852,7 +2762,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsValidSolution> =} callback
      **/
     queuedValidVariant: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiBlockVerifierImplsValidSolution,
       number
     >;
@@ -2871,7 +2780,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined> =} callback
      **/
     queuedSolutionBackings: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number],
       ) => Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined,
@@ -2886,26 +2794,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    queuedSolutionScore: GenericStorageQuery<Rv, (arg: number) => SpNposElectionsElectionScore | undefined, number>;
+    queuedSolutionScore: GenericStorageQuery<(arg: number) => SpNposElectionsElectionScore | undefined, number>;
 
     /**
      * The minimum score that each solution must attain in order to be considered feasible.
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Storage item for [`Status`].
      *
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsStatus> =} callback
      **/
-    statusStorage: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockVerifierImplsStatus>;
+    statusStorage: GenericStorageQuery<() => PalletElectionProviderMultiBlockVerifierImplsStatus>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s storage queries
@@ -2924,14 +2832,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, SpNposElectionsElectionScore]>> =} callback
      **/
-    sortedScores: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
+    sortedScores: GenericStorageQuery<(arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
 
     /**
      * Triple map from (round, account, page) to a solution page.
@@ -2940,7 +2848,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPolkadotRuntimeStakingNposCompactSolution16 | undefined> =} callback
      **/
     submissionStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => AssetHubPolkadotRuntimeStakingNposCompactSolution16 | undefined,
       [number, AccountId32, number]
     >;
@@ -2955,7 +2862,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined> =} callback
      **/
     submissionMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined,
       [number, AccountId32]
     >;
@@ -2963,7 +2869,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -2974,7 +2880,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -2983,7 +2889,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -2993,28 +2899,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -3023,7 +2929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -3035,7 +2941,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncLedgerStakingLedger | undefined> =} callback
      **/
     ledger: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingAsyncLedgerStakingLedger | undefined,
       AccountId32
     >;
@@ -3048,11 +2953,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined,
-      AccountId32
-    >;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -3062,14 +2963,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -3078,7 +2979,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -3104,18 +3005,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncNominations | undefined,
-      AccountId32
-    >;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -3128,14 +3025,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -3144,7 +3041,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current planned era index.
@@ -3154,7 +3051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -3164,7 +3061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingAsyncActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingAsyncActiveEraInfo | undefined>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -3174,7 +3071,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -3194,7 +3091,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3211,7 +3107,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncPalletBoundedExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => PalletStakingAsyncPalletBoundedExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -3227,7 +3122,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Exposure of validator at era with the preferences of validators.
@@ -3240,7 +3135,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncValidatorPrefs,
       [number, AccountId32]
     >;
@@ -3253,7 +3147,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -3262,7 +3156,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingAsyncEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -3271,14 +3165,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingAsyncForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingAsyncForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingAsyncForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -3287,7 +3181,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -3296,7 +3190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -3304,7 +3198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * Stores reported offences in a queue until they are processed in subsequent blocks.
@@ -3322,7 +3216,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncSlashingOffenceRecord | undefined> =} callback
      **/
     offenceQueue: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncSlashingOffenceRecord | undefined,
       [number, AccountId32]
     >;
@@ -3342,7 +3235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    offenceQueueEras: GenericStorageQuery<Rv, () => Array<number> | undefined>;
+    offenceQueueEras: GenericStorageQuery<() => Array<number> | undefined>;
 
     /**
      * Tracks the currently processed offence record from the `OffenceQueue`.
@@ -3361,7 +3254,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined> =} callback
      **/
     processingOffence: GenericStorageQuery<
-      Rv,
       () => [number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined
     >;
 
@@ -3372,7 +3264,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncUnappliedSlash | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, [AccountId32Like, Perbill, number]]) => PalletStakingAsyncUnappliedSlash | undefined,
       [number, [AccountId32, Perbill, number]]
     >;
@@ -3387,7 +3278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, Perbill]>> =} callback
      **/
-    cancelledSlashes: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, Perbill]>, number>;
+    cancelledSlashes: GenericStorageQuery<(arg: number) => Array<[AccountId32, Perbill]>, number>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -3397,7 +3288,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -3409,7 +3299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Voter snapshot progress status.
@@ -3419,7 +3309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncSnapshotStatus> =} callback
      **/
-    voterSnapshotStatus: GenericStorageQuery<Rv, () => PalletStakingAsyncSnapshotStatus>;
+    voterSnapshotStatus: GenericStorageQuery<() => PalletStakingAsyncSnapshotStatus>;
 
     /**
      * Keeps track of an ongoing multi-page election solution request.
@@ -3431,14 +3321,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextElectionPage: GenericStorageQuery<Rv, () => number | undefined>;
+    nextElectionPage: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A bounded list of the "electable" stashes that resulted from a successful election.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    electableStashes: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    electableStashes: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Tracks the current step of era pruning process for each era being lazily pruned.
@@ -3446,12 +3336,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncPalletPruningStep | undefined> =} callback
      **/
-    eraPruningState: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
+    eraPruningState: GenericStorageQuery<(arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhOps`'s storage queries
@@ -3477,7 +3367,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcLeaseReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3500,7 +3389,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, bigint] | undefined> =} callback
      **/
     rcCrowdloanContribution: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => [AccountId32, bigint] | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3520,7 +3408,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcCrowdloanReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3528,7 +3415,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhMigrator`'s storage queries
@@ -3542,18 +3429,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRcMigratorAccountsAccount | undefined> =} callback
      **/
-    rcAccounts: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined,
-      AccountId32
-    >;
+    rcAccounts: GenericStorageQuery<(arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined, AccountId32>;
 
     /**
      * The Asset Hub migration state.
      *
      * @param {Callback<PalletAhMigratorMigrationStage> =} callback
      **/
-    ahMigrationStage: GenericStorageQuery<Rv, () => PalletAhMigratorMigrationStage>;
+    ahMigrationStage: GenericStorageQuery<() => PalletAhMigratorMigrationStage>;
 
     /**
      * Helper storage item to store the total balance / total issuance of native token at the start
@@ -3562,7 +3445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAhMigratorBalancesBefore> =} callback
      **/
-    ahBalancesBefore: GenericStorageQuery<Rv, () => PalletAhMigratorBalancesBefore>;
+    ahBalancesBefore: GenericStorageQuery<() => PalletAhMigratorBalancesBefore>;
 
     /**
      * The priority of the DMP queue during migration.
@@ -3574,7 +3457,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    dmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    dmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -3584,7 +3467,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -3594,7 +3477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -3604,11 +3487,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/runtime.d.ts b/packages/chaintypes/src/polkadot-asset-hub/runtime.d.ts
index a3317e11..c33bbf42 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/runtime.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -54,7 +54,7 @@ import type {
   SystemParachainsCommonApisInflationInfo,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -66,19 +66,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraEd25519AppEd25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraEd25519AppEd25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -89,12 +89,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -116,12 +116,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -132,7 +132,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -140,7 +140,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -148,12 +148,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -164,7 +164,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -175,7 +175,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -184,12 +184,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -205,7 +205,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -216,7 +215,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -225,7 +224,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -237,14 +235,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -267,7 +264,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -280,7 +276,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -292,12 +288,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -315,7 +311,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -326,14 +322,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -347,7 +342,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -357,7 +351,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -369,12 +363,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -387,7 +381,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -398,7 +391,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -407,19 +399,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -433,7 +425,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
         len: number,
@@ -448,7 +439,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubPolkadotRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -458,7 +448,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -466,12 +456,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -488,7 +478,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -503,7 +492,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -520,7 +508,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -539,7 +526,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -549,7 +535,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -564,7 +550,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AssetHubPolkadotRuntimeOriginCaller,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
@@ -580,7 +565,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -590,7 +574,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -603,14 +587,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -628,7 +611,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -647,7 +629,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -657,7 +638,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -670,7 +651,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -684,7 +664,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -694,7 +673,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: FungiblesApi - 0xde92b8a0426b9bf6
@@ -707,14 +686,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} account
      **/
     queryAccountBalances: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like) => Promise<Result<XcmVersionedAssets, AssetsCommonRuntimeApiFungiblesAccessError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -729,12 +707,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -755,7 +733,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -776,7 +754,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -786,12 +764,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetConversionApi - 0x8a8047a53a8277ec
@@ -810,7 +788,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceTokensForExactTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -832,7 +809,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceExactTokensForTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -849,14 +825,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {StagingXcmV5Location} asset2
      **/
     getReserves: GenericRuntimeApiMethod<
-      Rv,
       (asset1: StagingXcmV5Location, asset2: StagingXcmV5Location) => Promise<[bigint, bigint] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -867,12 +842,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -884,7 +859,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -893,7 +868,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -902,7 +877,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -910,7 +885,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -921,7 +896,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -936,7 +911,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -950,7 +925,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -958,7 +933,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -966,7 +941,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -974,12 +949,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -991,7 +966,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -1000,7 +975,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -1009,12 +984,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Inflation - 0xc51ff1fa3f5d0cca
@@ -1028,14 +1003,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Inflation_experimental_issuance_prediction_info
      **/
-    experimentalIssuancePredictionInfo: GenericRuntimeApiMethod<
-      Rv,
-      () => Promise<SystemParachainsCommonApisInflationInfo>
-    >;
+    experimentalIssuancePredictionInfo: GenericRuntimeApiMethod<() => Promise<SystemParachainsCommonApisInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/tx.d.ts b/packages/chaintypes/src/polkadot-asset-hub/tx.d.ts
index 852ba7e8..6aa8df36 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/tx.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -125,16 +123,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AssetHubPolkadotRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AssetHubPolkadotRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -147,16 +147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -166,16 +165,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -185,16 +183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -207,16 +204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -226,16 +222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -245,16 +240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -268,19 +262,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -290,16 +283,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -308,16 +300,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeTask} task
      **/
     doTask: GenericTxCall<
-      Rv,
       (task: AssetHubPolkadotRuntimeRuntimeTask) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'DoTask';
             params: { task: AssetHubPolkadotRuntimeRuntimeTask };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -330,16 +321,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -356,16 +346,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -383,23 +372,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -420,12 +408,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -435,7 +421,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -444,23 +431,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -490,23 +476,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -515,7 +500,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -530,16 +515,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -554,16 +538,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -576,16 +559,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -597,16 +579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -618,23 +599,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -649,14 +629,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -668,7 +646,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -679,19 +658,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -705,7 +683,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -713,7 +690,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -726,7 +702,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -736,16 +713,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -758,14 +734,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -777,7 +751,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -791,7 +766,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -799,7 +773,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -812,7 +785,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -835,20 +809,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -871,20 +844,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -894,16 +866,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -913,23 +884,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -944,23 +914,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: AssetHubPolkadotRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: AssetHubPolkadotRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -979,19 +948,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1004,20 +972,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1033,19 +1000,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1070,19 +1036,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1095,19 +1060,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1124,16 +1088,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1146,19 +1109,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1173,19 +1135,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1202,26 +1163,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1240,15 +1200,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1268,16 +1227,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1300,19 +1258,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1337,20 +1294,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1381,19 +1337,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1409,26 +1364,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -1464,19 +1418,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1503,14 +1456,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1522,7 +1473,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1560,13 +1512,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -1577,7 +1527,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1605,16 +1556,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1625,27 +1575,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -1669,16 +1618,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1692,16 +1640,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1717,16 +1664,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1738,15 +1684,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1759,15 +1704,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1780,16 +1724,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1802,16 +1745,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1827,16 +1769,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1853,26 +1794,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1893,19 +1833,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: AssetHubPolkadotRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: AssetHubPolkadotRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1925,22 +1864,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -1953,15 +1891,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1974,15 +1911,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1996,16 +1932,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2019,16 +1954,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2042,23 +1976,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -2070,19 +2003,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2114,14 +2046,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2133,7 +2063,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2177,14 +2108,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2196,7 +2125,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2214,19 +2144,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2242,19 +2171,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2268,16 +2196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2290,16 +2217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2314,16 +2240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2366,7 +2291,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2374,7 +2298,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2387,7 +2310,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2418,7 +2342,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2426,7 +2349,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2439,7 +2361,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2452,16 +2375,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2507,7 +2429,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2515,7 +2436,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2528,7 +2448,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2544,19 +2465,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2619,7 +2539,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -2629,7 +2548,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2644,7 +2562,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2665,19 +2584,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2688,16 +2606,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2707,22 +2624,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -2731,7 +2647,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s transaction calls
@@ -2744,26 +2660,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isCongested
      **/
     reportBridgeStatus: GenericTxCall<
-      Rv,
       (
         bridgeId: H256,
         isCongested: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ToKusamaXcmRouter';
           palletCall: {
             name: 'ReportBridgeStatus';
             params: { bridgeId: H256; isCongested: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -2776,19 +2691,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2813,14 +2727,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -2832,14 +2744,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s transaction calls
@@ -2851,16 +2764,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SnowbridgeCoreOperatingModeBasicOperatingMode} mode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (mode: SnowbridgeCoreOperatingModeBasicOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'SetOperatingMode';
             params: { mode: SnowbridgeCoreOperatingModeBasicOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2878,13 +2790,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} feeAsset
      **/
     registerToken: GenericTxCall<
-      Rv,
       (
         assetId: XcmVersionedLocation,
         metadata: SnowbridgeCoreAssetMetadata,
         feeAsset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
@@ -2895,7 +2805,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAsset: StagingXcmV5Asset;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2907,26 +2818,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} asset
      **/
     addTip: GenericTxCall<
-      Rv,
       (
         messageId: SnowbridgeCoreRewardMessageId,
         asset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'AddTip';
             params: { messageId: SnowbridgeCoreRewardMessageId; asset: StagingXcmV5Asset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -2955,16 +2865,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPolkadotRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2987,19 +2896,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3021,16 +2929,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPolkadotRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3046,19 +2953,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubPolkadotRuntimeOriginCaller,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AssetHubPolkadotRuntimeOriginCaller; call: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3080,16 +2986,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubPolkadotRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AssetHubPolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3105,19 +3010,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AssetHubPolkadotRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3150,19 +3054,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: AssetHubPolkadotRuntimeRuntimeCallLike,
         fallback: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: AssetHubPolkadotRuntimeRuntimeCallLike; fallback: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3177,26 +3080,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubPolkadotRuntimeOriginCaller,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: AssetHubPolkadotRuntimeOriginCaller; call: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3220,19 +3122,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3284,7 +3185,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3292,7 +3192,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3305,7 +3204,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3348,7 +3248,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3356,7 +3255,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3369,7 +3267,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3402,14 +3301,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3421,7 +3318,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3445,27 +3343,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -3487,13 +3384,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubPolkadotRuntimeProxyType | undefined,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3504,7 +3399,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3524,20 +3420,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubPolkadotRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubPolkadotRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3555,20 +3450,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubPolkadotRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubPolkadotRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3582,15 +3476,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3619,20 +3512,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AssetHubPolkadotRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AssetHubPolkadotRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3661,7 +3553,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AssetHubPolkadotRuntimeProxyType,
@@ -3669,7 +3560,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3682,7 +3572,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3707,19 +3598,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3739,19 +3629,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3771,19 +3660,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3806,14 +3694,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AssetHubPolkadotRuntimeProxyType | undefined,
         call: AssetHubPolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3825,7 +3711,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubPolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3841,22 +3728,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -3879,16 +3765,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3910,19 +3795,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3943,16 +3827,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3976,20 +3859,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4010,16 +3892,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4038,23 +3919,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -4086,20 +3966,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4130,21 +4009,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4165,16 +4043,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4195,16 +4072,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4225,16 +4101,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4253,16 +4128,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4285,20 +4159,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4324,20 +4197,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4366,20 +4238,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4408,20 +4279,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4452,21 +4322,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4488,19 +4357,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4520,19 +4388,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4550,16 +4417,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4577,16 +4443,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4606,19 +4471,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4642,21 +4506,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4684,21 +4547,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4718,16 +4580,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4754,7 +4615,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -4762,14 +4622,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4789,16 +4649,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4836,7 +4695,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -4847,7 +4705,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -4863,7 +4720,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4894,20 +4752,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4930,19 +4787,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4966,20 +4822,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5009,21 +4864,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5041,16 +4895,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5073,19 +4926,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5107,19 +4959,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5139,19 +4990,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5174,19 +5024,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5206,19 +5055,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5245,27 +5093,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -5293,19 +5140,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: number,
         admin: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: number; admin: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5333,20 +5179,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: number; owner: MultiAddressLike; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5371,19 +5216,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5405,20 +5249,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: number; item: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5444,20 +5287,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         checkOwner: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number; checkOwner: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5485,20 +5327,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5525,19 +5366,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5557,19 +5397,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5589,19 +5428,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5619,16 +5457,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5646,16 +5483,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5676,19 +5512,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5712,14 +5547,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5731,7 +5564,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5756,20 +5590,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5796,20 +5629,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         maybeCheckDelegate: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; maybeCheckDelegate: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5840,7 +5672,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
@@ -5850,7 +5681,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5865,7 +5695,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5894,21 +5725,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5933,20 +5763,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5975,21 +5804,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6012,19 +5840,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6051,20 +5878,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6085,16 +5911,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6113,16 +5938,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6143,19 +5967,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6178,14 +6001,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -6197,7 +6018,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6217,27 +6039,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nfts`'s transaction calls
@@ -6264,19 +6085,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     create: GenericTxCall<
-      Rv,
       (
         admin: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Create';
             params: { admin: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6301,19 +6121,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         owner: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCreate';
             params: { owner: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6340,19 +6159,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletNftsDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletNftsDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6380,14 +6198,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintWitness | undefined} witnessData
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         witnessData: PalletNftsMintWitness | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6399,7 +6215,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessData: PalletNftsMintWitness | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6424,21 +6241,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsItemConfig} itemConfig
      **/
     forceMint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         itemConfig: PalletNftsItemConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceMint';
             params: { collection: number; item: number; mintTo: MultiAddressLike; itemConfig: PalletNftsItemConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6459,19 +6275,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6496,20 +6311,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6536,19 +6350,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6568,19 +6381,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     lockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6600,19 +6412,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     unlockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UnlockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6634,19 +6445,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsBitFlags} lockSettings
      **/
     lockCollection: GenericTxCall<
-      Rv,
       (
         collection: number,
         lockSettings: PalletNftsBitFlags,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockCollection';
             params: { collection: number; lockSettings: PalletNftsBitFlags };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6667,19 +6477,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6707,14 +6516,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike | undefined,
         admin: MultiAddressLike | undefined,
         freezer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6726,7 +6533,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6746,19 +6554,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     forceCollectionOwner: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionOwner';
             params: { collection: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6778,19 +6585,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCollectionConfig: GenericTxCall<
-      Rv,
       (
         collection: number,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionConfig';
             params: { collection: number; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6816,21 +6622,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeDeadline
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         maybeDeadline: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike; maybeDeadline: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6855,20 +6660,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6891,19 +6695,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearAllTransferApprovals: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearAllTransferApprovals';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6932,21 +6735,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} lockAttributes
      **/
     lockItemProperties: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         lockMetadata: boolean,
         lockAttributes: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemProperties';
             params: { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6981,7 +6783,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
@@ -6989,7 +6790,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7002,7 +6802,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7033,7 +6834,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     forceSetAttribute: GenericTxCall<
-      Rv,
       (
         setAs: AccountId32Like | undefined,
         collection: number,
@@ -7042,7 +6842,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7056,7 +6855,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7083,14 +6883,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         namespace: PalletNftsAttributeNamespace,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7102,7 +6900,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               key: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7122,20 +6921,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveItemAttributes: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveItemAttributes';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7157,14 +6955,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCancelAttributesApprovalWitness} witness
      **/
     cancelItemAttributesApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         witness: PalletNftsCancelAttributesApprovalWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7176,7 +6972,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletNftsCancelAttributesApprovalWitness;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7203,20 +7000,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7239,19 +7035,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7276,19 +7071,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7309,16 +7103,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7337,16 +7130,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7365,19 +7157,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7396,19 +7187,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintSettings} mintSettings
      **/
     updateMintSettings: GenericTxCall<
-      Rv,
       (
         collection: number,
         mintSettings: PalletNftsMintSettings,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UpdateMintSettings';
             params: { collection: number; mintSettings: PalletNftsMintSettings };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7431,14 +7221,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7450,7 +7238,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7470,20 +7259,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7499,16 +7287,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletNftsItemTip>} tips
      **/
     payTips: GenericTxCall<
-      Rv,
       (tips: Array<PalletNftsItemTip>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'PayTips';
             params: { tips: Array<PalletNftsItemTip> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7538,7 +7325,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     createSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
@@ -7547,7 +7333,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maybePrice: PalletNftsPriceWithDirection | undefined,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7561,7 +7346,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7580,19 +7366,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} offeredItem
      **/
     cancelSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelSwap';
             params: { offeredCollection: number; offeredItem: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7617,7 +7402,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsPriceWithDirection | undefined} witnessPrice
      **/
     claimSwap: GenericTxCall<
-      Rv,
       (
         sendCollection: number,
         sendItem: number,
@@ -7625,7 +7409,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         receiveItem: number,
         witnessPrice: PalletNftsPriceWithDirection | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7638,7 +7421,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessPrice: PalletNftsPriceWithDirection | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7662,20 +7446,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     mintPreSigned: GenericTxCall<
-      Rv,
       (
         mintData: PalletNftsPreSignedMint,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'MintPreSigned';
             params: { mintData: PalletNftsPreSignedMint; signature: SpRuntimeMultiSignature; signer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7699,13 +7482,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     setAttributesPreSigned: GenericTxCall<
-      Rv,
       (
         data: PalletNftsPreSignedAttributes,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7716,14 +7497,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signer: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ForeignAssets`'s transaction calls
@@ -7755,20 +7537,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Create';
             params: { id: StagingXcmV5Location; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7799,21 +7580,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7834,16 +7614,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7864,16 +7643,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7894,16 +7672,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7922,16 +7699,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7954,20 +7730,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Mint';
             params: { id: StagingXcmV5Location; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7993,20 +7768,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Burn';
             params: { id: StagingXcmV5Location; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8035,20 +7809,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8077,20 +7850,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8121,21 +7893,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: StagingXcmV5Location; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8157,19 +7928,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8189,19 +7959,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8219,16 +7988,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8246,16 +8014,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8275,19 +8042,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8311,14 +8077,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8330,7 +8094,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8358,21 +8123,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: StagingXcmV5Location; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8392,16 +8156,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8428,7 +8191,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
@@ -8436,7 +8198,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8449,7 +8210,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8469,16 +8231,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8516,7 +8277,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
@@ -8527,7 +8287,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8543,7 +8302,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8574,20 +8334,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8610,19 +8369,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8646,20 +8404,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8689,14 +8446,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8708,7 +8463,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8726,16 +8482,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Touch';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8758,19 +8513,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Refund';
             params: { id: StagingXcmV5Location; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8792,19 +8546,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: StagingXcmV5Location; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8824,19 +8577,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8859,19 +8611,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8891,19 +8642,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Block';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8930,27 +8680,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: StagingXcmV5Location; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PoolAssets`'s transaction calls
@@ -8982,20 +8731,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9026,21 +8774,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9061,16 +8808,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9091,16 +8837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9121,16 +8866,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9149,16 +8893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9181,20 +8924,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9220,20 +8962,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9262,20 +9003,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9304,20 +9044,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9348,21 +9087,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9384,19 +9122,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9416,19 +9153,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9446,16 +9182,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9473,16 +9208,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9502,19 +9236,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9538,21 +9271,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9580,21 +9312,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9614,16 +9345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9650,7 +9380,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -9658,14 +9387,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9685,16 +9414,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9732,7 +9460,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -9743,7 +9470,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
@@ -9759,7 +9485,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9790,20 +9517,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9826,19 +9552,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9862,20 +9587,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9905,21 +9629,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9937,16 +9660,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9969,19 +9691,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10003,19 +9724,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10035,19 +9755,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10070,19 +9789,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10102,19 +9820,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10141,27 +9858,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversion`'s transaction calls
@@ -10177,19 +9893,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'CreatePool';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10218,7 +9933,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} mintTo
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10228,7 +9942,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2Min: bigint,
         mintTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10243,7 +9956,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               mintTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10260,7 +9974,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} withdrawTo
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10269,7 +9982,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2MinReceive: bigint,
         withdrawTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10283,7 +9995,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               withdrawTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10302,7 +10015,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapExactTokensForTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountIn: bigint,
@@ -10310,7 +10022,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10323,7 +10034,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10342,7 +10054,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapTokensForExactTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountOut: bigint,
@@ -10350,7 +10061,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10363,7 +10073,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10384,26 +10095,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     touch: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'Touch';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -10432,19 +10142,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10474,16 +10183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10521,14 +10229,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: ParachainsCommonPayVersionedLocatableAccount,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -10540,7 +10246,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10570,16 +10277,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10609,16 +10315,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10643,23 +10348,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -10680,19 +10384,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10727,14 +10430,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -10746,7 +10447,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10769,16 +10471,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10797,19 +10498,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10848,19 +10548,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10887,27 +10586,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -10929,13 +10627,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: AssetHubPolkadotRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -10946,7 +10642,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10963,16 +10660,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10988,16 +10684,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11012,16 +10707,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11036,16 +10730,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11058,16 +10751,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11085,16 +10777,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11110,16 +10801,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11136,26 +10826,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -11166,16 +10855,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11184,16 +10872,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11204,20 +10891,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11226,23 +10912,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: AssetHubPolkadotRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: AssetHubPolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -11266,19 +10951,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11294,16 +10978,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11320,20 +11003,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11359,16 +11041,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11384,16 +11065,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11413,19 +11093,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11442,16 +11121,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11469,16 +11147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11497,19 +11174,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11531,20 +11207,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11568,23 +11243,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -11616,20 +11290,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11656,21 +11329,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11699,19 +11371,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11755,19 +11426,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11795,20 +11465,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11834,19 +11503,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11878,26 +11546,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -11913,19 +11580,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11939,19 +11605,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11964,23 +11629,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -11994,16 +11658,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12035,13 +11698,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -12052,7 +11713,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12066,19 +11728,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12095,20 +11756,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12118,16 +11778,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12146,26 +11805,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -12193,19 +11851,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12221,16 +11878,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12246,15 +11902,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12295,19 +11950,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12323,19 +11977,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12367,19 +12020,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12408,21 +12060,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12441,7 +12092,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -12449,7 +12099,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12462,7 +12111,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12484,19 +12134,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12516,19 +12165,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12542,19 +12190,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12579,7 +12226,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -12588,7 +12234,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12602,7 +12247,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12621,14 +12267,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12640,7 +12284,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12666,16 +12311,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12694,19 +12338,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12722,16 +12365,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12744,16 +12386,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12768,19 +12409,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12795,19 +12435,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12821,19 +12460,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12858,16 +12496,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12883,16 +12520,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12906,19 +12542,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12936,16 +12571,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12963,16 +12597,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12990,23 +12623,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -13027,16 +12659,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13055,16 +12686,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13077,26 +12707,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingRcClient`'s transaction calls
@@ -13108,16 +12737,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientSessionReport} report
      **/
     relaySessionReport: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientSessionReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelaySessionReport';
             params: { report: PalletStakingAsyncRcClientSessionReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13126,23 +12754,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletStakingAsyncRcClientOffence]>} offences
      **/
     relayNewOffencePaged: GenericTxCall<
-      Rv,
       (offences: Array<[number, PalletStakingAsyncRcClientOffence]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelayNewOffencePaged';
             params: { offences: Array<[number, PalletStakingAsyncRcClientOffence]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElection`'s transaction calls
@@ -13158,23 +12785,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockAdminOperation} op
      **/
     manage: GenericTxCall<
-      Rv,
       (op: PalletElectionProviderMultiBlockAdminOperation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElection';
           palletCall: {
             name: 'Manage';
             params: { op: PalletElectionProviderMultiBlockAdminOperation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s transaction calls
@@ -13183,7 +12809,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionUnsigned`'s transaction calls
@@ -13209,23 +12835,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockPagedRawSolution} pagedSolution
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionUnsigned';
           palletCall: {
             name: 'SubmitUnsigned';
             params: { pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s transaction calls
@@ -13237,16 +12862,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore} claimedScore
      **/
     register: GenericTxCall<
-      Rv,
       (claimedScore: SpNposElectionsElectionScore) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Register';
             params: { claimedScore: SpNposElectionsElectionScore };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13264,19 +12888,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubPolkadotRuntimeStakingNposCompactSolution16 | undefined} maybeSolution
      **/
     submitPage: GenericTxCall<
-      Rv,
       (
         page: number,
         maybeSolution: AssetHubPolkadotRuntimeStakingNposCompactSolution16 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SubmitPage';
             params: { page: number; maybeSolution: AssetHubPolkadotRuntimeStakingNposCompactSolution16 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13289,15 +12912,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bail: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Bail';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13313,19 +12935,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessPages
      **/
     clearOldRoundData: GenericTxCall<
-      Rv,
       (
         round: number,
         witnessPages: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'ClearOldRoundData';
             params: { round: number; witnessPages: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13337,23 +12958,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} inv
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (inv: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SetInvulnerables';
             params: { inv: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -13377,19 +12997,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingAsyncRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13408,16 +13027,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13445,16 +13063,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13482,16 +13099,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13505,16 +13121,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingAsyncValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingAsyncValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13528,16 +13143,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13555,15 +13169,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13577,16 +13190,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingAsyncRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13602,15 +13214,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13622,16 +13233,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13644,16 +13254,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13666,16 +13275,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13692,15 +13300,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13718,15 +13325,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13738,16 +13344,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13765,19 +13370,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13794,15 +13398,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13823,19 +13426,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Perbill]>} validatorSlashes
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         validatorSlashes: Array<[AccountId32Like, Perbill]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; validatorSlashes: Array<[AccountId32Like, Perbill]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13858,19 +13460,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13882,16 +13483,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13919,19 +13519,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13951,16 +13550,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13992,7 +13590,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingAsyncPalletConfigOp,
         minValidatorBond: PalletStakingAsyncPalletConfigOp,
@@ -14002,7 +13599,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingAsyncPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14017,7 +13613,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14052,16 +13649,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14073,16 +13669,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14095,16 +13690,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14132,20 +13726,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14160,16 +13753,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14185,16 +13777,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14217,14 +13808,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingAsyncLedgerUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -14236,7 +13825,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14252,16 +13842,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14304,19 +13893,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[AccountId32Like, Perbill, number]} slashKey
      **/
     applySlash: GenericTxCall<
-      Rv,
       (
         slashEra: number,
         slashKey: [AccountId32Like, Perbill, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ApplySlash';
             params: { slashEra: number; slashKey: [AccountId32Like, Perbill, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14336,23 +13924,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     pruneEraStep: GenericTxCall<
-      Rv,
       (era: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PruneEraStep';
             params: { era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhOps`'s transaction calls
@@ -14373,13 +13960,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveLeaseDeposit: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -14390,7 +13975,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14408,13 +13994,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     withdrawCrowdloanContribution: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -14425,7 +14009,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14444,13 +14029,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     unreserveCrowdloanReserve: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -14461,7 +14044,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               paraId: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14474,23 +14058,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} assetId
      **/
     transferToPostMigrationTreasury: GenericTxCall<
-      Rv,
       (assetId: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'TransferToPostMigrationTreasury';
             params: { assetId: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhMigrator`'s transaction calls
@@ -14504,16 +14087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorAccountsAccount>} accounts
      **/
     receiveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorAccountsAccount>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAccounts';
             params: { accounts: Array<PalletRcMigratorAccountsAccount> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14527,16 +14109,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorMultisigRcMultisig>} accounts
      **/
     receiveMultisigs: GenericTxCall<
-      Rv,
       (accounts: Array<PalletRcMigratorMultisigRcMultisig>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveMultisigs';
             params: { accounts: Array<PalletRcMigratorMultisigRcMultisig> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14546,16 +14127,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxy>} proxies
      **/
     receiveProxyProxies: GenericTxCall<
-      Rv,
       (proxies: Array<PalletRcMigratorProxyRcProxy>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyProxies';
             params: { proxies: Array<PalletRcMigratorProxyRcProxy> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14565,16 +14145,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorProxyRcProxyAnnouncement>} announcements
      **/
     receiveProxyAnnouncements: GenericTxCall<
-      Rv,
       (announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveProxyAnnouncements';
             params: { announcements: Array<PalletRcMigratorProxyRcProxyAnnouncement> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14583,16 +14162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageChunksRcPreimageChunk>} chunks
      **/
     receivePreimageChunks: GenericTxCall<
-      Rv,
       (chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageChunks';
             params: { chunks: Array<PalletRcMigratorPreimageChunksRcPreimageChunk> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14601,16 +14179,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>} requestStatus
      **/
     receivePreimageRequestStatus: GenericTxCall<
-      Rv,
       (requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageRequestStatus';
             params: { requestStatus: Array<PalletRcMigratorPreimageRequestStatusPortableRequestStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14619,18 +14196,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>} legacyStatus
      **/
     receivePreimageLegacyStatus: GenericTxCall<
-      Rv,
       (
         legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceivePreimageLegacyStatus';
             params: { legacyStatus: Array<PalletRcMigratorPreimageLegacyRequestStatusRcPreimageLegacyStatus> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14639,16 +14215,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>} messages
      **/
     receiveNomPoolsMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveNomPoolsMessages';
             params: { messages: Array<PalletRcMigratorStakingNomPoolsRcNomPoolsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14657,16 +14232,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorVestingRcVestingSchedule>} schedules
      **/
     receiveVestingSchedules: GenericTxCall<
-      Rv,
       (schedules: Array<PalletRcMigratorVestingRcVestingSchedule>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveVestingSchedules';
             params: { schedules: Array<PalletRcMigratorVestingRcVestingSchedule> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14676,16 +14250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorReferendaReferendaMessage>} values
      **/
     receiveReferendaValues: GenericTxCall<
-      Rv,
       (values: Array<PalletRcMigratorReferendaReferendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaValues';
             params: { values: Array<PalletRcMigratorReferendaReferendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14695,16 +14268,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletReferendaReferendumInfo]>} referendums
      **/
     receiveReferendums: GenericTxCall<
-      Rv,
       (referendums: Array<[number, PalletReferendaReferendumInfo]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendums';
             params: { referendums: Array<[number, PalletReferendaReferendumInfo]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14713,16 +14285,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorClaimsRcClaimsMessage>} messages
      **/
     receiveClaims: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorClaimsRcClaimsMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveClaims';
             params: { messages: Array<PalletRcMigratorClaimsRcClaimsMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14731,16 +14302,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>} messages
      **/
     receiveBagsListMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBagsListMessages';
             params: { messages: Array<PalletRcMigratorStakingBagsListPortableBagsListMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14749,16 +14319,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerRcSchedulerMessage>} messages
      **/
     receiveSchedulerMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerMessages';
             params: { messages: Array<PalletRcMigratorSchedulerRcSchedulerMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14767,16 +14336,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorIndicesRcIndicesIndex>} indices
      **/
     receiveIndices: GenericTxCall<
-      Rv,
       (indices: Array<PalletRcMigratorIndicesRcIndicesIndex>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveIndices';
             params: { indices: Array<PalletRcMigratorIndicesRcIndicesIndex> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14785,16 +14353,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>} messages
      **/
     receiveConvictionVotingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveConvictionVotingMessages';
             params: { messages: Array<PalletRcMigratorConvictionVotingRcConvictionVotingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14803,16 +14370,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorBountiesRcBountiesMessage>} messages
      **/
     receiveBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorBountiesRcBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveBountiesMessages';
             params: { messages: Array<PalletRcMigratorBountiesRcBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14821,16 +14387,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>} rates
      **/
     receiveAssetRates: GenericTxCall<
-      Rv,
       (rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveAssetRates';
             params: { rates: Array<[PolkadotRuntimeCommonImplsVersionedLocatableAsset, FixedU128]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14839,16 +14404,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>} messages
      **/
     receiveCrowdloanMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveCrowdloanMessages';
             params: { messages: Array<PalletRcMigratorCrowdloanRcCrowdloanMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14857,16 +14421,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, H256]>} metadata
      **/
     receiveReferendaMetadata: GenericTxCall<
-      Rv,
       (metadata: Array<[number, H256]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveReferendaMetadata';
             params: { metadata: Array<[number, H256]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14875,16 +14438,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorTreasuryPortableTreasuryMessage>} messages
      **/
     receiveTreasuryMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveTreasuryMessages';
             params: { messages: Array<PalletRcMigratorTreasuryPortableTreasuryMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14893,16 +14455,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>} messages
      **/
     receiveSchedulerAgendaMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveSchedulerAgendaMessages';
             params: { messages: Array<PalletRcMigratorSchedulerSchedulerAgendaMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14911,18 +14472,17 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>} messages
      **/
     receiveDelegatedStakingMessages: GenericTxCall<
-      Rv,
       (
         messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveDelegatedStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingDelegatedStakingPortableDelegatedStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14931,16 +14491,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>} messages
      **/
     receiveChildBountiesMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveChildBountiesMessages';
             params: { messages: Array<PalletRcMigratorChildBountiesPortableChildBountiesMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14949,16 +14508,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletRcMigratorStakingMessagePortableStakingMessage>} messages
      **/
     receiveStakingMessages: GenericTxCall<
-      Rv,
       (messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ReceiveStakingMessages';
             params: { messages: Array<PalletRcMigratorStakingMessagePortableStakingMessage> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14971,16 +14529,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAhMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletAhMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletAhMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14992,15 +14549,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'StartMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15012,16 +14568,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setDmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetDmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15034,16 +14589,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15060,19 +14614,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} coolOffEndAt
      **/
     finishMigration: GenericTxCall<
-      Rv,
       (
         data: PalletRcMigratorMigrationFinishedData | undefined,
         coolOffEndAt: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'FinishMigration';
             params: { data: PalletRcMigratorMigrationFinishedData | undefined; coolOffEndAt: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15085,25 +14638,24 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-asset-hub/view-functions.d.ts b/packages/chaintypes/src/polkadot-asset-hub/view-functions.d.ts
index e14bf89e..2e061f05 100644
--- a/packages/chaintypes/src/polkadot-asset-hub/view-functions.d.ts
+++ b/packages/chaintypes/src/polkadot-asset-hub/view-functions.d.ts
@@ -1,10 +1,10 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type { AssetHubPolkadotRuntimeRuntimeCallLike, AssetHubPolkadotRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -16,7 +16,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubPolkadotRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: AssetHubPolkadotRuntimeRuntimeCallLike, proxyType: AssetHubPolkadotRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -27,14 +26,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubPolkadotRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: AssetHubPolkadotRuntimeProxyType, against: AssetHubPolkadotRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -51,12 +49,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s view functions
@@ -72,11 +70,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AccountId32Like} who
      * @param {number} pages
      **/
-    depositFor: GenericViewFunction<Rv, (who: AccountId32Like, pages: number) => Promise<bigint>>;
+    depositFor: GenericViewFunction<(who: AccountId32Like, pages: number) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/consts.d.ts b/packages/chaintypes/src/polkadot-people/consts.d.ts
index d2357046..1979e12f 100644
--- a/packages/chaintypes/src/polkadot-people/consts.d.ts
+++ b/packages/chaintypes/src/polkadot-people/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, AccountId32 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   SpWeightsWeightV2Weight,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/polkadot-people/errors.d.ts b/packages/chaintypes/src/polkadot-people/errors.d.ts
index 2a44b227..9ba718f1 100644
--- a/packages/chaintypes/src/polkadot-people/errors.d.ts
+++ b/packages/chaintypes/src/polkadot-people/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -108,12 +108,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -122,67 +122,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -191,92 +191,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -285,32 +285,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -319,32 +319,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -354,152 +354,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -509,32 +509,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -542,24 +542,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -568,12 +568,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -582,78 +582,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -662,47 +662,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -711,157 +711,157 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/events.d.ts b/packages/chaintypes/src/polkadot-people/events.d.ts
index cd49b6cb..1868f47c 100644
--- a/packages/chaintypes/src/polkadot-people/events.d.ts
+++ b/packages/chaintypes/src/polkadot-people/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, FixedBytes, Bytes, Result } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -23,7 +23,7 @@ import type {
   PalletProxyDepositKind,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -31,18 +31,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -51,33 +45,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -86,7 +79,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -95,13 +88,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -110,18 +102,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -131,7 +122,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -140,7 +130,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -152,7 +142,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -171,20 +160,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -199,7 +187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -219,7 +206,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -241,7 +227,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -261,7 +246,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -275,7 +259,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -284,40 +268,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -326,87 +309,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -417,7 +400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -426,7 +408,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -436,7 +418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -445,18 +426,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -465,13 +445,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -481,7 +460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -490,13 +468,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -507,7 +484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -516,7 +492,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -526,28 +502,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -556,12 +532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -570,13 +546,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -591,7 +566,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -606,7 +580,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -618,7 +591,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -629,7 +601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -640,7 +611,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -652,7 +622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -669,7 +638,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -681,7 +649,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -693,7 +660,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -709,7 +675,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -718,13 +683,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -736,7 +700,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -747,7 +710,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -758,7 +720,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -769,7 +730,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -785,7 +745,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -797,7 +756,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -813,7 +771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -823,7 +780,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -834,7 +790,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -844,7 +799,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -854,7 +808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -863,14 +816,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -880,7 +832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -890,7 +841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -899,7 +849,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -909,29 +859,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -941,7 +886,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -969,7 +913,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1004,7 +947,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1034,7 +976,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1053,7 +994,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1063,47 +1004,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1113,7 +1054,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1123,7 +1063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1133,7 +1072,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1149,7 +1087,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1159,7 +1096,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1168,7 +1104,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1177,14 +1113,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: PeoplePolkadotRuntimeProxyType; disambiguationIndex: number }
@@ -1194,7 +1129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1208,13 +1142,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeoplePolkadotRuntimeProxyType; delay: number }
@@ -1224,7 +1157,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeoplePolkadotRuntimeProxyType; delay: number }
@@ -1234,7 +1166,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1243,7 +1174,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1252,23 +1183,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1278,7 +1208,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1287,23 +1216,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1313,7 +1236,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -1322,18 +1244,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1344,7 +1260,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1353,23 +1268,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1378,19 +1292,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1399,21 +1312,21 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/index.d.ts b/packages/chaintypes/src/polkadot-people/index.d.ts
index f77184c3..262925da 100644
--- a/packages/chaintypes/src/polkadot-people/index.d.ts
+++ b/packages/chaintypes/src/polkadot-people/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PeoplePolkadotRuntimeRuntimeCall,
@@ -41,26 +41,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPolkadotPeopleApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: PolkadotPeopleApi
  * @specVersion: 2000000
  **/
-export interface PolkadotPeopleApi {
-  legacy: VersionedPolkadotPeopleApi<RpcLegacy>;
-  v2: VersionedPolkadotPeopleApi<RpcV2>;
+export interface PolkadotPeopleApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/polkadot-people/json-rpc.d.ts b/packages/chaintypes/src/polkadot-people/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/polkadot-people/json-rpc.d.ts
+++ b/packages/chaintypes/src/polkadot-people/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/polkadot-people/query.d.ts b/packages/chaintypes/src/polkadot-people/query.d.ts
index bd18901a..9fbf67c3 100644
--- a/packages/chaintypes/src/polkadot-people/query.d.ts
+++ b/packages/chaintypes/src/polkadot-people/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -67,7 +67,7 @@ import type {
   PalletIdentityProvider,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -78,35 +78,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -114,7 +114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -122,28 +122,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -156,14 +156,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -180,21 +180,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -202,21 +202,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -229,12 +229,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -250,7 +250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -260,7 +260,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -274,7 +273,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -285,7 +284,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -294,14 +293,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -310,7 +309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -323,7 +322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -334,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -346,7 +345,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -360,7 +359,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -374,7 +372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -384,7 +382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -395,7 +393,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -406,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -416,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -425,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -435,7 +431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -446,7 +441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -455,21 +450,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -477,7 +472,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -485,7 +480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -493,7 +488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -502,12 +497,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -518,7 +513,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -528,12 +523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -543,12 +538,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -561,7 +556,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -572,12 +567,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -588,14 +583,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -626,7 +621,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -637,7 +632,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -647,7 +642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -655,7 +650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -663,12 +658,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -678,18 +673,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -700,12 +695,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -716,7 +711,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -727,7 +722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -735,7 +730,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -744,7 +739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -753,12 +748,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -769,14 +764,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -784,7 +779,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -792,7 +787,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PeoplePolkadotRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PeoplePolkadotRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PeoplePolkadotRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -803,7 +798,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -811,11 +806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PeoplePolkadotRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PeoplePolkadotRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PeoplePolkadotRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -824,7 +815,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -832,7 +822,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -843,7 +833,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -852,12 +842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -872,7 +862,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -882,12 +872,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -905,7 +895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -917,7 +907,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -926,7 +916,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -938,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -948,14 +936,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -964,7 +952,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -972,7 +959,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -983,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -991,7 +978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1002,7 +989,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1010,7 +997,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1019,7 +1006,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1031,7 +1017,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1044,7 +1029,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1056,14 +1040,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1072,7 +1056,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1084,7 +1067,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1094,7 +1076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1107,7 +1089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1119,7 +1101,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1130,7 +1112,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1138,7 +1119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1151,7 +1132,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1161,7 +1141,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1170,7 +1150,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1178,7 +1157,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1191,7 +1170,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1199,7 +1177,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1212,11 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1224,16 +1198,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1248,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -1256,7 +1226,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1265,7 +1235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1277,7 +1247,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1287,7 +1257,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1295,7 +1265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1308,7 +1278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1322,7 +1292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1336,11 +1305,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/runtime.d.ts b/packages/chaintypes/src/polkadot-people/runtime.d.ts
index c83e402f..bfe7e512 100644
--- a/packages/chaintypes/src/polkadot-people/runtime.d.ts
+++ b/packages/chaintypes/src/polkadot-people/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -51,7 +51,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -63,19 +63,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -86,12 +86,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -113,12 +113,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -129,7 +129,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -137,7 +137,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -145,12 +145,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -161,7 +161,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -172,7 +172,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -181,12 +181,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -202,7 +202,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -213,7 +212,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -222,7 +221,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -234,14 +232,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -264,7 +261,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -277,7 +273,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -289,12 +285,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -312,7 +308,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -323,14 +319,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -344,7 +339,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -354,7 +348,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -366,12 +360,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -384,7 +378,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -395,7 +388,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -404,19 +396,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -430,7 +422,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PeoplePolkadotRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -442,7 +433,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PeoplePolkadotRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -452,7 +442,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -460,12 +450,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -482,7 +472,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -497,7 +486,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -514,7 +502,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -533,7 +520,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -543,7 +529,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -558,7 +544,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PeoplePolkadotRuntimeOriginCaller,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
@@ -574,7 +559,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -584,7 +568,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -597,14 +581,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -622,7 +605,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -641,7 +623,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -651,7 +632,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -664,7 +645,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -678,7 +658,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -688,7 +667,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -703,12 +682,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -719,12 +698,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -745,7 +724,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -766,7 +745,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -776,11 +755,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/tx.d.ts b/packages/chaintypes/src/polkadot-people/tx.d.ts
index 6c6a6e57..d034af02 100644
--- a/packages/chaintypes/src/polkadot-people/tx.d.ts
+++ b/packages/chaintypes/src/polkadot-people/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type { MultiAddressLike, Extrinsic, BytesLike, H256, AccountId32Like, FixedBytes, Data } from 'dedot/codecs';
 import type {
@@ -38,16 +36,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PeoplePolkadotRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PeoplePolkadotRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -60,16 +60,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -79,16 +78,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -98,16 +96,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -120,16 +117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -139,16 +135,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -158,16 +153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -181,19 +175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -203,16 +196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -225,16 +217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -251,16 +242,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -278,23 +268,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -315,12 +304,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -330,7 +317,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -339,23 +327,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -385,23 +372,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -410,7 +396,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -426,16 +412,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -452,20 +437,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -477,15 +461,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -499,23 +482,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -534,19 +516,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -559,20 +540,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -588,19 +568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -625,19 +604,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -650,19 +628,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -679,16 +656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -701,19 +677,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -728,19 +703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -757,26 +731,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -800,16 +773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -823,16 +795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -848,16 +819,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -869,15 +839,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -890,15 +859,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -911,16 +879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -933,16 +900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -958,16 +924,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -984,26 +949,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1024,19 +988,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PeoplePolkadotRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PeoplePolkadotRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1056,22 +1019,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -1084,15 +1046,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1105,15 +1066,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1127,16 +1087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1150,16 +1109,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1173,23 +1131,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -1201,19 +1158,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1245,14 +1201,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1264,7 +1218,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1308,14 +1263,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1327,7 +1280,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1345,19 +1299,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1373,19 +1326,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1399,16 +1351,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1421,16 +1372,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1445,16 +1395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1497,7 +1446,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1505,7 +1453,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1518,7 +1465,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1549,7 +1497,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1557,7 +1504,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1570,7 +1516,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1583,16 +1530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1638,7 +1584,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1646,7 +1591,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1659,7 +1603,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1675,19 +1620,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1750,7 +1694,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -1760,7 +1703,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1775,7 +1717,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1796,19 +1739,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1819,16 +1761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1838,22 +1779,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -1862,7 +1802,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -1875,19 +1815,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1912,14 +1851,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -1931,14 +1868,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1967,16 +1905,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePolkadotRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PeoplePolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1999,19 +1936,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PeoplePolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2033,16 +1969,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePolkadotRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PeoplePolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2058,19 +1993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PeoplePolkadotRuntimeOriginCaller,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PeoplePolkadotRuntimeOriginCaller; call: PeoplePolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2092,16 +2026,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeoplePolkadotRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PeoplePolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PeoplePolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2117,19 +2050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PeoplePolkadotRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PeoplePolkadotRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2162,19 +2094,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PeoplePolkadotRuntimeRuntimeCallLike,
         fallback: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PeoplePolkadotRuntimeRuntimeCallLike; fallback: PeoplePolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2189,26 +2120,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PeoplePolkadotRuntimeOriginCaller,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PeoplePolkadotRuntimeOriginCaller; call: PeoplePolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -2232,19 +2162,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PeoplePolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2296,7 +2225,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2304,7 +2232,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PeoplePolkadotRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2317,7 +2244,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2360,7 +2288,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2368,7 +2295,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2381,7 +2307,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2414,14 +2341,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2433,7 +2358,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2457,27 +2383,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2499,13 +2424,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PeoplePolkadotRuntimeProxyType | undefined,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2516,7 +2439,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeoplePolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2536,20 +2460,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeoplePolkadotRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PeoplePolkadotRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2567,20 +2490,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeoplePolkadotRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PeoplePolkadotRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2594,15 +2516,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2631,20 +2552,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PeoplePolkadotRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PeoplePolkadotRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2673,7 +2593,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PeoplePolkadotRuntimeProxyType,
@@ -2681,7 +2600,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2694,7 +2612,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2719,19 +2638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2751,19 +2669,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2783,19 +2700,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2818,14 +2734,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PeoplePolkadotRuntimeProxyType | undefined,
         call: PeoplePolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2837,7 +2751,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeoplePolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2853,22 +2768,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2886,16 +2800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2914,16 +2827,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeoplePolkadotRuntimePeopleIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PeoplePolkadotRuntimePeopleIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PeoplePolkadotRuntimePeopleIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2941,16 +2853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2966,15 +2877,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3000,19 +2910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3031,16 +2940,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3057,19 +2965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3086,19 +2993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3115,19 +3021,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3154,21 +3059,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3189,16 +3093,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3215,19 +3118,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3241,19 +3143,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3269,16 +3170,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3296,15 +3196,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3320,20 +3219,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3344,19 +3242,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3381,14 +3278,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -3400,7 +3295,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3411,16 +3307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3432,16 +3327,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3451,16 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3472,16 +3365,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3492,16 +3384,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3512,22 +3403,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/polkadot-people/view-functions.d.ts b/packages/chaintypes/src/polkadot-people/view-functions.d.ts
index 7a7c5549..e29e1afd 100644
--- a/packages/chaintypes/src/polkadot-people/view-functions.d.ts
+++ b/packages/chaintypes/src/polkadot-people/view-functions.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { PeoplePolkadotRuntimeRuntimeCallLike, PeoplePolkadotRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -15,7 +15,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeoplePolkadotRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PeoplePolkadotRuntimeRuntimeCallLike, proxyType: PeoplePolkadotRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -26,13 +25,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeoplePolkadotRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: PeoplePolkadotRuntimeProxyType, against: PeoplePolkadotRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/consts.d.ts b/packages/chaintypes/src/polkadot/consts.d.ts
index 7c2391dd..dc5eb3d0 100644
--- a/packages/chaintypes/src/polkadot/consts.d.ts
+++ b/packages/chaintypes/src/polkadot/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, AccountId32, Bytes, Perbill, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   StagingXcmV5Junctions,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/polkadot/errors.d.ts b/packages/chaintypes/src/polkadot/errors.d.ts
index c4a0f550..790752d9 100644
--- a/packages/chaintypes/src/polkadot/errors.d.ts
+++ b/packages/chaintypes/src/polkadot/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -68,32 +68,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -102,47 +102,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -151,27 +151,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -180,32 +180,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -214,67 +214,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -283,182 +283,182 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -467,32 +467,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -502,43 +502,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -547,63 +547,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -612,68 +612,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -682,77 +682,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -761,32 +761,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Claims`'s errors
@@ -795,38 +795,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid Ethereum signature.
      **/
-    InvalidEthereumSignature: GenericPalletError<Rv>;
+    InvalidEthereumSignature: GenericPalletError;
 
     /**
      * Ethereum address has no claim.
      **/
-    SignerHasNoClaim: GenericPalletError<Rv>;
+    SignerHasNoClaim: GenericPalletError;
 
     /**
      * Account ID sending transaction has no claim.
      **/
-    SenderHasNoClaim: GenericPalletError<Rv>;
+    SenderHasNoClaim: GenericPalletError;
 
     /**
      * There's not enough in the pot to pay out some unvested amount. Generally implies a
      * logic error.
      **/
-    PotUnderflow: GenericPalletError<Rv>;
+    PotUnderflow: GenericPalletError;
 
     /**
      * A needed statement was not included.
      **/
-    InvalidStatement: GenericPalletError<Rv>;
+    InvalidStatement: GenericPalletError;
 
     /**
      * The account already has a vested balance.
      **/
-    VestedBalanceExists: GenericPalletError<Rv>;
+    VestedBalanceExists: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -835,33 +835,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -870,12 +870,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -884,47 +884,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -933,78 +933,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -1013,68 +1013,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * User is not the proposer of the bounty.
      **/
-    NotProposer: GenericPalletError<Rv>;
+    NotProposer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -1083,22 +1083,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -1107,82 +1107,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -1191,17 +1191,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -1210,44 +1210,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -1256,160 +1256,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -1420,37 +1420,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -1459,17 +1459,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -1478,52 +1478,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StakingAhClient`'s errors
@@ -1532,12 +1532,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Could not process incoming message because incoming messages are blocked.
      **/
-    Blocked: GenericPalletError<Rv>;
+    Blocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Configuration`'s errors
@@ -1546,12 +1546,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The new value for a configuration parameter is invalid.
      **/
-    InvalidNewValue: GenericPalletError<Rv>;
+    InvalidNewValue: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInclusion`'s errors
@@ -1560,95 +1560,95 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Validator index out of bounds.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Candidate submitted but para not scheduled.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Head data exceeds the configured maximum.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Code upgrade prematurely.
      **/
-    PrematureCodeUpgrade: GenericPalletError<Rv>;
+    PrematureCodeUpgrade: GenericPalletError;
 
     /**
      * Output code is too large
      **/
-    NewCodeTooLarge: GenericPalletError<Rv>;
+    NewCodeTooLarge: GenericPalletError;
 
     /**
      * The candidate's relay-parent was not allowed. Either it was
      * not recent enough or it didn't advance based on the last parachain block.
      **/
-    DisallowedRelayParent: GenericPalletError<Rv>;
+    DisallowedRelayParent: GenericPalletError;
 
     /**
      * Failed to compute group index for the core: either it's out of bounds
      * or the relay parent doesn't belong to the current session.
      **/
-    InvalidAssignment: GenericPalletError<Rv>;
+    InvalidAssignment: GenericPalletError;
 
     /**
      * Invalid group index in core assignment.
      **/
-    InvalidGroupIndex: GenericPalletError<Rv>;
+    InvalidGroupIndex: GenericPalletError;
 
     /**
      * Insufficient (non-majority) backing.
      **/
-    InsufficientBacking: GenericPalletError<Rv>;
+    InsufficientBacking: GenericPalletError;
 
     /**
      * Invalid (bad signature, unknown validator, etc.) backing.
      **/
-    InvalidBacking: GenericPalletError<Rv>;
+    InvalidBacking: GenericPalletError;
 
     /**
      * The validation data hash does not match expected.
      **/
-    ValidationDataHashMismatch: GenericPalletError<Rv>;
+    ValidationDataHashMismatch: GenericPalletError;
 
     /**
      * The downward message queue is not processed correctly.
      **/
-    IncorrectDownwardMessageHandling: GenericPalletError<Rv>;
+    IncorrectDownwardMessageHandling: GenericPalletError;
 
     /**
      * At least one upward message sent does not pass the acceptance criteria.
      **/
-    InvalidUpwardMessages: GenericPalletError<Rv>;
+    InvalidUpwardMessages: GenericPalletError;
 
     /**
      * The candidate didn't follow the rules of HRMP watermark advancement.
      **/
-    HrmpWatermarkMishandling: GenericPalletError<Rv>;
+    HrmpWatermarkMishandling: GenericPalletError;
 
     /**
      * The HRMP messages sent by the candidate is not valid.
      **/
-    InvalidOutboundHrmp: GenericPalletError<Rv>;
+    InvalidOutboundHrmp: GenericPalletError;
 
     /**
      * The validation code hash of the candidate is not valid.
      **/
-    InvalidValidationCodeHash: GenericPalletError<Rv>;
+    InvalidValidationCodeHash: GenericPalletError;
 
     /**
      * The `para_head` hash in the candidate descriptor doesn't match the hash of the actual
      * para head in the commitments.
      **/
-    ParaHeadMismatch: GenericPalletError<Rv>;
+    ParaHeadMismatch: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInherent`'s errors
@@ -1657,29 +1657,29 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Inclusion inherent called more than once per block.
      **/
-    TooManyInclusionInherents: GenericPalletError<Rv>;
+    TooManyInclusionInherents: GenericPalletError;
 
     /**
      * The hash of the submitted parent header doesn't correspond to the saved block hash of
      * the parent.
      **/
-    InvalidParentHeader: GenericPalletError<Rv>;
+    InvalidParentHeader: GenericPalletError;
 
     /**
      * Inherent data was filtered during execution. This should have only been done
      * during creation.
      **/
-    InherentDataFilteredDuringExecution: GenericPalletError<Rv>;
+    InherentDataFilteredDuringExecution: GenericPalletError;
 
     /**
      * Too many candidates supplied.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Paras`'s errors
@@ -1688,87 +1688,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Para is not registered in our system.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Para cannot be onboarded because it is already tracked by our system.
      **/
-    CannotOnboard: GenericPalletError<Rv>;
+    CannotOnboard: GenericPalletError;
 
     /**
      * Para cannot be offboarded at this time.
      **/
-    CannotOffboard: GenericPalletError<Rv>;
+    CannotOffboard: GenericPalletError;
 
     /**
      * Para cannot be upgraded to a lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para cannot be downgraded to an on-demand parachain.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is stale.
      **/
-    PvfCheckStatementStale: GenericPalletError<Rv>;
+    PvfCheckStatementStale: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is for a future session.
      **/
-    PvfCheckStatementFuture: GenericPalletError<Rv>;
+    PvfCheckStatementFuture: GenericPalletError;
 
     /**
      * Claimed validator index is out of bounds.
      **/
-    PvfCheckValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    PvfCheckValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * The signature for the PVF pre-checking is invalid.
      **/
-    PvfCheckInvalidSignature: GenericPalletError<Rv>;
+    PvfCheckInvalidSignature: GenericPalletError;
 
     /**
      * The given validator already has cast a vote.
      **/
-    PvfCheckDoubleVote: GenericPalletError<Rv>;
+    PvfCheckDoubleVote: GenericPalletError;
 
     /**
      * The given PVF does not exist at the moment of process a vote.
      **/
-    PvfCheckSubjectInvalid: GenericPalletError<Rv>;
+    PvfCheckSubjectInvalid: GenericPalletError;
 
     /**
      * Parachain cannot currently schedule a code upgrade.
      **/
-    CannotUpgradeCode: GenericPalletError<Rv>;
+    CannotUpgradeCode: GenericPalletError;
 
     /**
      * Invalid validation code size.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Invalid block number.
      **/
-    InvalidBlockNumber: GenericPalletError<Rv>;
+    InvalidBlockNumber: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Hrmp`'s errors
@@ -1777,107 +1777,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The sender tried to open a channel to themselves.
      **/
-    OpenHrmpChannelToSelf: GenericPalletError<Rv>;
+    OpenHrmpChannelToSelf: GenericPalletError;
 
     /**
      * The recipient is not a valid para.
      **/
-    OpenHrmpChannelInvalidRecipient: GenericPalletError<Rv>;
+    OpenHrmpChannelInvalidRecipient: GenericPalletError;
 
     /**
      * The requested capacity is zero.
      **/
-    OpenHrmpChannelZeroCapacity: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroCapacity: GenericPalletError;
 
     /**
      * The requested capacity exceeds the global limit.
      **/
-    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError;
 
     /**
      * The requested maximum message size is 0.
      **/
-    OpenHrmpChannelZeroMessageSize: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroMessageSize: GenericPalletError;
 
     /**
      * The open request requested the message size that exceeds the global limit.
      **/
-    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError;
 
     /**
      * The channel already exists
      **/
-    OpenHrmpChannelAlreadyExists: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyExists: GenericPalletError;
 
     /**
      * There is already a request to open the same channel.
      **/
-    OpenHrmpChannelAlreadyRequested: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyRequested: GenericPalletError;
 
     /**
      * The sender already has the maximum number of allowed outbound channels.
      **/
-    OpenHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    OpenHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The channel from the sender to the origin doesn't exist.
      **/
-    AcceptHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    AcceptHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel is already confirmed.
      **/
-    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The recipient already has the maximum number of allowed inbound channels.
      **/
-    AcceptHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    AcceptHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The origin tries to close a channel where it is neither the sender nor the recipient.
      **/
-    CloseHrmpChannelUnauthorized: GenericPalletError<Rv>;
+    CloseHrmpChannelUnauthorized: GenericPalletError;
 
     /**
      * The channel to be closed doesn't exist.
      **/
-    CloseHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    CloseHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel close request is already requested.
      **/
-    CloseHrmpChannelAlreadyUnderway: GenericPalletError<Rv>;
+    CloseHrmpChannelAlreadyUnderway: GenericPalletError;
 
     /**
      * Canceling is requested by neither the sender nor recipient of the open channel request.
      **/
-    CancelHrmpOpenChannelUnauthorized: GenericPalletError<Rv>;
+    CancelHrmpOpenChannelUnauthorized: GenericPalletError;
 
     /**
      * The open request doesn't exist.
      **/
-    OpenHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    OpenHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * Cannot cancel an HRMP open channel request because it is already confirmed.
      **/
-    OpenHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The provided witness data is wrong.
      **/
-    WrongWitness: GenericPalletError<Rv>;
+    WrongWitness: GenericPalletError;
 
     /**
      * The channel between these two chains cannot be authorized.
      **/
-    ChannelCreationNotAuthorized: GenericPalletError<Rv>;
+    ChannelCreationNotAuthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasDisputes`'s errors
@@ -1886,52 +1886,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Duplicate dispute statement sets provided.
      **/
-    DuplicateDisputeStatementSets: GenericPalletError<Rv>;
+    DuplicateDisputeStatementSets: GenericPalletError;
 
     /**
      * Ancient dispute statement provided.
      **/
-    AncientDisputeStatement: GenericPalletError<Rv>;
+    AncientDisputeStatement: GenericPalletError;
 
     /**
      * Validator index on statement is out of bounds for session.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Invalid signature on statement.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Validator vote submitted more than once to dispute.
      **/
-    DuplicateStatement: GenericPalletError<Rv>;
+    DuplicateStatement: GenericPalletError;
 
     /**
      * A dispute where there are only votes on one side.
      **/
-    SingleSidedDispute: GenericPalletError<Rv>;
+    SingleSidedDispute: GenericPalletError;
 
     /**
      * A dispute vote from a malicious backer.
      **/
-    MaliciousBacker: GenericPalletError<Rv>;
+    MaliciousBacker: GenericPalletError;
 
     /**
      * No backing votes were provides along dispute statements.
      **/
-    MissingBackingVotes: GenericPalletError<Rv>;
+    MissingBackingVotes: GenericPalletError;
 
     /**
      * Unconfirmed dispute statement sets provided.
      **/
-    UnconfirmedDispute: GenericPalletError<Rv>;
+    UnconfirmedDispute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasSlashing`'s errors
@@ -1940,38 +1940,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The key ownership proof is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * The session index is too old or invalid.
      **/
-    InvalidSessionIndex: GenericPalletError<Rv>;
+    InvalidSessionIndex: GenericPalletError;
 
     /**
      * The candidate hash is invalid.
      **/
-    InvalidCandidateHash: GenericPalletError<Rv>;
+    InvalidCandidateHash: GenericPalletError;
 
     /**
      * There is no pending slash for the given validator index and time
      * slot.
      **/
-    InvalidValidatorIndex: GenericPalletError<Rv>;
+    InvalidValidatorIndex: GenericPalletError;
 
     /**
      * The validator index does not match the validator id.
      **/
-    ValidatorIndexIdMismatch: GenericPalletError<Rv>;
+    ValidatorIndexIdMismatch: GenericPalletError;
 
     /**
      * The given slashing report is valid but already previously reported.
      **/
-    DuplicateSlashingReport: GenericPalletError<Rv>;
+    DuplicateSlashingReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OnDemand`'s errors
@@ -1980,40 +1980,40 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The order queue is full, `place_order` will not continue.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The current spot price is higher than the max amount specified in the `place_order`
      * call, making it invalid.
      **/
-    SpotPriceHigherThanMaxAmount: GenericPalletError<Rv>;
+    SpotPriceHigherThanMaxAmount: GenericPalletError;
 
     /**
      * The account doesn't have enough credits to purchase on-demand coretime.
      **/
-    InsufficientCredits: GenericPalletError<Rv>;
+    InsufficientCredits: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s errors
    **/
   coretimeAssignmentProvider: {
-    AssignmentsEmpty: GenericPalletError<Rv>;
+    AssignmentsEmpty: GenericPalletError;
 
     /**
      * assign_core is only allowed to append new assignments at the end of already existing
      * ones or update the last entry.
      **/
-    DisallowedInsert: GenericPalletError<Rv>;
+    DisallowedInsert: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Registrar`'s errors
@@ -2022,79 +2022,79 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The ID is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * The ID is already registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * The caller is not the owner of this Id.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Invalid para code size.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * Invalid para head data size.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Para is not a Parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Para is not a Parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Cannot deregister para
      **/
-    CannotDeregister: GenericPalletError<Rv>;
+    CannotDeregister: GenericPalletError;
 
     /**
      * Cannot schedule downgrade of lease holding parachain to on-demand parachain
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * Cannot schedule upgrade of on-demand parachain to lease holding parachain
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para is locked from manipulation by the manager. Must use parachain or relay chain
      * governance.
      **/
-    ParaLocked: GenericPalletError<Rv>;
+    ParaLocked: GenericPalletError;
 
     /**
      * The ID given for registration has not been reserved.
      **/
-    NotReserved: GenericPalletError<Rv>;
+    NotReserved: GenericPalletError;
 
     /**
      * The validation code is invalid.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Cannot perform a parachain slot / lifecycle swap. Check that the state of both paras
      * are correct for the swap to work.
      **/
-    CannotSwap: GenericPalletError<Rv>;
+    CannotSwap: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Slots`'s errors
@@ -2103,17 +2103,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parachain ID is not onboarding.
      **/
-    ParaNotOnboarding: GenericPalletError<Rv>;
+    ParaNotOnboarding: GenericPalletError;
 
     /**
      * There was an error with the lease.
      **/
-    LeaseError: GenericPalletError<Rv>;
+    LeaseError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Auctions`'s errors
@@ -2122,42 +2122,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * This auction is already in progress.
      **/
-    AuctionInProgress: GenericPalletError<Rv>;
+    AuctionInProgress: GenericPalletError;
 
     /**
      * The lease period is in the past.
      **/
-    LeasePeriodInPast: GenericPalletError<Rv>;
+    LeasePeriodInPast: GenericPalletError;
 
     /**
      * Para is not registered
      **/
-    ParaNotRegistered: GenericPalletError<Rv>;
+    ParaNotRegistered: GenericPalletError;
 
     /**
      * Not a current auction.
      **/
-    NotCurrentAuction: GenericPalletError<Rv>;
+    NotCurrentAuction: GenericPalletError;
 
     /**
      * Not an auction.
      **/
-    NotAuction: GenericPalletError<Rv>;
+    NotAuction: GenericPalletError;
 
     /**
      * Auction has already ended.
      **/
-    AuctionEnded: GenericPalletError<Rv>;
+    AuctionEnded: GenericPalletError;
 
     /**
      * The para is already leased out for part of this range.
      **/
-    AlreadyLeasedOut: GenericPalletError<Rv>;
+    AlreadyLeasedOut: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Crowdloan`'s errors
@@ -2166,123 +2166,123 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The current lease period is more than the first lease period.
      **/
-    FirstPeriodInPast: GenericPalletError<Rv>;
+    FirstPeriodInPast: GenericPalletError;
 
     /**
      * The first lease period needs to at least be less than 3 `max_value`.
      **/
-    FirstPeriodTooFarInFuture: GenericPalletError<Rv>;
+    FirstPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * Last lease period must be greater than first lease period.
      **/
-    LastPeriodBeforeFirstPeriod: GenericPalletError<Rv>;
+    LastPeriodBeforeFirstPeriod: GenericPalletError;
 
     /**
      * The last lease period cannot be more than 3 periods after the first period.
      **/
-    LastPeriodTooFarInFuture: GenericPalletError<Rv>;
+    LastPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * The campaign ends before the current block number. The end must be in the future.
      **/
-    CannotEndInPast: GenericPalletError<Rv>;
+    CannotEndInPast: GenericPalletError;
 
     /**
      * The end date for this crowdloan is not sensible.
      **/
-    EndTooFarInFuture: GenericPalletError<Rv>;
+    EndTooFarInFuture: GenericPalletError;
 
     /**
      * There was an overflow.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The contribution was below the minimum, `MinContribution`.
      **/
-    ContributionTooSmall: GenericPalletError<Rv>;
+    ContributionTooSmall: GenericPalletError;
 
     /**
      * Invalid fund index.
      **/
-    InvalidParaId: GenericPalletError<Rv>;
+    InvalidParaId: GenericPalletError;
 
     /**
      * Contributions exceed maximum amount.
      **/
-    CapExceeded: GenericPalletError<Rv>;
+    CapExceeded: GenericPalletError;
 
     /**
      * The contribution period has already ended.
      **/
-    ContributionPeriodOver: GenericPalletError<Rv>;
+    ContributionPeriodOver: GenericPalletError;
 
     /**
      * The origin of this call is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * This crowdloan does not correspond to a parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * This parachain lease is still active and retirement cannot yet begin.
      **/
-    LeaseActive: GenericPalletError<Rv>;
+    LeaseActive: GenericPalletError;
 
     /**
      * This parachain's bid or lease is still active and withdraw cannot yet begin.
      **/
-    BidOrLeaseActive: GenericPalletError<Rv>;
+    BidOrLeaseActive: GenericPalletError;
 
     /**
      * The crowdloan has not yet ended.
      **/
-    FundNotEnded: GenericPalletError<Rv>;
+    FundNotEnded: GenericPalletError;
 
     /**
      * There are no contributions stored in this crowdloan.
      **/
-    NoContributions: GenericPalletError<Rv>;
+    NoContributions: GenericPalletError;
 
     /**
      * The crowdloan is not ready to dissolve. Potentially still has a slot or in retirement
      * period.
      **/
-    NotReadyToDissolve: GenericPalletError<Rv>;
+    NotReadyToDissolve: GenericPalletError;
 
     /**
      * Invalid signature.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * The provided memo is too large.
      **/
-    MemoTooLarge: GenericPalletError<Rv>;
+    MemoTooLarge: GenericPalletError;
 
     /**
      * The fund is already in `NewRaise`
      **/
-    AlreadyInNewRaise: GenericPalletError<Rv>;
+    AlreadyInNewRaise: GenericPalletError;
 
     /**
      * No contributions allowed during the VRF delay
      **/
-    VrfDelayInProgress: GenericPalletError<Rv>;
+    VrfDelayInProgress: GenericPalletError;
 
     /**
      * A lease period has not started yet, due to an offset in the starting block.
      **/
-    NoLeasePeriod: GenericPalletError<Rv>;
+    NoLeasePeriod: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Coretime`'s errors
@@ -2291,23 +2291,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The paraid making the call is not the coretime brokerage system parachain.
      **/
-    NotBroker: GenericPalletError<Rv>;
+    NotBroker: GenericPalletError;
 
     /**
      * Requested revenue information `when` parameter was in the future from the current
      * block height.
      **/
-    RequestedFutureRevenue: GenericPalletError<Rv>;
+    RequestedFutureRevenue: GenericPalletError;
 
     /**
      * Failed to transfer assets to the coretime chain
      **/
-    AssetTransferFailed: GenericPalletError<Rv>;
+    AssetTransferFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2316,7 +2316,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2327,32 +2327,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmPallet`'s errors
@@ -2362,152 +2362,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -2517,32 +2517,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -2550,24 +2550,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2576,22 +2576,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Beefy`'s errors
@@ -2600,140 +2600,140 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A double voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidDoubleVotingProof: GenericPalletError<Rv>;
+    InvalidDoubleVotingProof: GenericPalletError;
 
     /**
      * A fork voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidForkVotingProof: GenericPalletError<Rv>;
+    InvalidForkVotingProof: GenericPalletError;
 
     /**
      * A future block voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidFutureBlockVotingProof: GenericPalletError<Rv>;
+    InvalidFutureBlockVotingProof: GenericPalletError;
 
     /**
      * The session of the equivocation proof is invalid
      **/
-    InvalidEquivocationProofSession: GenericPalletError<Rv>;
+    InvalidEquivocationProofSession: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RcMigrator`'s errors
    **/
   rcMigrator: {
-    Unreachable: GenericPalletError<Rv>;
-    OutOfWeight: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
+    OutOfWeight: GenericPalletError;
 
     /**
      * Failed to send XCM message to AH.
      **/
-    XcmError: GenericPalletError<Rv>;
+    XcmError: GenericPalletError;
 
     /**
      * Failed to withdraw account from RC for migration to AH.
      **/
-    FailedToWithdrawAccount: GenericPalletError<Rv>;
+    FailedToWithdrawAccount: GenericPalletError;
 
     /**
      * Indicates that the specified block number is in the past.
      **/
-    PastBlockNumber: GenericPalletError<Rv>;
+    PastBlockNumber: GenericPalletError;
 
     /**
      * Indicates that there is not enough time for staking to lock.
      *
      * Schedule the migration at least two sessions before the current era ends.
      **/
-    EraEndsTooSoon: GenericPalletError<Rv>;
+    EraEndsTooSoon: GenericPalletError;
 
     /**
      * Balance accounting overflow.
      **/
-    BalanceOverflow: GenericPalletError<Rv>;
+    BalanceOverflow: GenericPalletError;
 
     /**
      * Balance accounting underflow.
      **/
-    BalanceUnderflow: GenericPalletError<Rv>;
+    BalanceUnderflow: GenericPalletError;
 
     /**
      * The query response is invalid.
      **/
-    InvalidQueryResponse: GenericPalletError<Rv>;
+    InvalidQueryResponse: GenericPalletError;
 
     /**
      * The xcm query was not found.
      **/
-    QueryNotFound: GenericPalletError<Rv>;
+    QueryNotFound: GenericPalletError;
 
     /**
      * Failed to send XCM message.
      **/
-    XcmSendError: GenericPalletError<Rv>;
+    XcmSendError: GenericPalletError;
 
     /**
      * The migration stage is not reachable from the current stage.
      **/
-    UnreachableStage: GenericPalletError<Rv>;
+    UnreachableStage: GenericPalletError;
 
     /**
      * Invalid parameter.
      **/
-    InvalidParameter: GenericPalletError<Rv>;
+    InvalidParameter: GenericPalletError;
 
     /**
      * The AH UMP queue priority configuration is already set.
      **/
-    AhUmpQueuePriorityAlreadySet: GenericPalletError<Rv>;
+    AhUmpQueuePriorityAlreadySet: GenericPalletError;
 
     /**
      * The account is referenced by some other pallet. It might have freezes or holds.
      **/
-    AccountReferenced: GenericPalletError<Rv>;
+    AccountReferenced: GenericPalletError;
 
     /**
      * The XCM version is invalid.
      **/
-    BadXcmVersion: GenericPalletError<Rv>;
+    BadXcmVersion: GenericPalletError;
 
     /**
      * The origin is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The stage transition is invalid.
      **/
-    InvalidStageTransition: GenericPalletError<Rv>;
+    InvalidStageTransition: GenericPalletError;
 
     /**
      * Unsigned validation failed.
      **/
-    UnsignedValidationFailed: GenericPalletError<Rv>;
+    UnsignedValidationFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/events.d.ts b/packages/chaintypes/src/polkadot/events.d.ts
index d54ecd35..1791114b 100644
--- a/packages/chaintypes/src/polkadot/events.d.ts
+++ b/packages/chaintypes/src/polkadot/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -67,7 +67,7 @@ import type {
   PalletRcMigratorMigrationSettings,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -75,18 +75,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -95,33 +89,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -130,7 +123,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -139,18 +132,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -160,7 +152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -170,7 +161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -180,7 +170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -190,7 +179,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -201,7 +189,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -211,7 +198,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -220,12 +206,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -234,22 +220,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -258,23 +244,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -283,7 +268,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -292,40 +277,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -334,87 +318,87 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -425,7 +409,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -434,7 +417,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -444,18 +427,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -464,14 +441,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -481,17 +457,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -499,39 +470,38 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -541,7 +511,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -550,38 +519,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -592,12 +556,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Historical`'s events
@@ -606,17 +570,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The merkle root of the validators of the said session were stored
      **/
-    RootStored: GenericPalletEvent<Rv, 'Historical', 'RootStored', { index: number }>;
+    RootStored: GenericPalletEvent<'Historical', 'RootStored', { index: number }>;
 
     /**
      * The merkle roots of up to this session index were pruned
      **/
-    RootsPruned: GenericPalletEvent<Rv, 'Historical', 'RootsPruned', { upTo: number }>;
+    RootsPruned: GenericPalletEvent<'Historical', 'RootsPruned', { upTo: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -626,28 +590,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -657,7 +621,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -666,17 +629,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -685,38 +648,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -725,18 +682,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -752,28 +703,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -782,18 +733,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -803,7 +753,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -812,12 +761,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -827,7 +776,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -852,7 +800,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -877,7 +824,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -902,7 +848,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -922,7 +867,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -948,7 +892,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -959,7 +902,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -974,7 +916,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -994,7 +935,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1009,7 +949,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1029,7 +968,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1049,7 +987,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1069,7 +1006,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1089,7 +1025,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -1114,7 +1049,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -1134,7 +1068,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1153,16 +1086,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1171,7 +1103,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Claims`'s events
@@ -1181,7 +1113,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Someone claimed some DOTs.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'Claims',
       'Claimed',
       { who: AccountId32; ethereumAddress: EthereumAddress; amount: bigint }
@@ -1190,7 +1121,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -1199,28 +1130,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1230,47 +1156,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1279,14 +1205,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1301,7 +1226,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1315,13 +1239,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       {
@@ -1336,7 +1259,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       {
@@ -1351,7 +1273,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1360,7 +1281,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1370,7 +1291,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1380,7 +1300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1390,7 +1309,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1406,7 +1324,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1416,7 +1333,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1425,7 +1341,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -1434,28 +1350,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -1464,38 +1379,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty deposit has been poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Bounties',
       'DepositPoked',
       { bountyId: number; proposer: AccountId32; oldDeposit: bigint; newDeposit: bigint }
@@ -1504,7 +1418,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -1513,13 +1427,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -1529,7 +1442,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -1538,12 +1450,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -1559,7 +1471,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -1573,7 +1484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -1584,23 +1494,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -1609,7 +1518,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -1618,17 +1527,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -1637,13 +1546,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -1652,12 +1560,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -1673,7 +1576,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -1688,7 +1590,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -1697,13 +1598,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -1717,7 +1617,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -1728,7 +1627,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -1737,13 +1635,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -1753,7 +1650,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -1763,7 +1659,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -1773,7 +1668,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -1783,7 +1677,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -1793,7 +1686,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -1803,7 +1695,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -1813,7 +1704,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -1823,7 +1713,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -1832,19 +1721,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -1854,7 +1737,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -1864,7 +1746,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -1880,7 +1761,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -1889,22 +1770,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -1912,17 +1788,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -1932,7 +1808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1942,7 +1817,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1952,7 +1826,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1962,7 +1835,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -1971,7 +1843,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingAhClient`'s events
@@ -1981,7 +1853,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new validator set has been received.
      **/
     ValidatorSetReceived: GenericPalletEvent<
-      Rv,
       'StakingAhClient',
       'ValidatorSetReceived',
       { id: number; newValidatorSetCount: number; pruneUpTo?: number | undefined; leftover: boolean }
@@ -1993,24 +1864,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Note that this event is more resembling an error, but we use an event because in this
      * pallet we need to mutate storage upon some failures.
      **/
-    CouldNotMergeAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'CouldNotMergeAndDropped', null>;
+    CouldNotMergeAndDropped: GenericPalletEvent<'StakingAhClient', 'CouldNotMergeAndDropped', null>;
 
     /**
      * The validator set received is way too small, as per
      * [`Config::MinimumValidatorSetSize`].
      **/
-    SetTooSmallAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'SetTooSmallAndDropped', null>;
+    SetTooSmallAndDropped: GenericPalletEvent<'StakingAhClient', 'SetTooSmallAndDropped', null>;
 
     /**
      * Something occurred that should never happen under normal operation. Logged as an event
      * for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParaInclusion`'s events
@@ -2020,7 +1891,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was backed. `[candidate, head_data]`
      **/
     CandidateBacked: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateBacked',
       [
@@ -2035,7 +1905,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was included. `[candidate, head_data]`
      **/
     CandidateIncluded: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateIncluded',
       [
@@ -2050,7 +1919,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate timed out. `[candidate, head_data]`
      **/
     CandidateTimedOut: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateTimedOut',
       [
@@ -2064,7 +1932,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some upward messages have been received and will be processed.
      **/
     UpwardMessagesReceived: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'UpwardMessagesReceived',
       { from: PolkadotParachainPrimitivesPrimitivesId; count: number }
@@ -2073,7 +1940,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Paras`'s events
@@ -2082,39 +1949,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current code has been updated for a Para. `para_id`
      **/
-    CurrentCodeUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentCodeUpdated: GenericPalletEvent<'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Current head has been updated for a Para. `para_id`
      **/
-    CurrentHeadUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentHeadUpdated: GenericPalletEvent<'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A code upgrade has been scheduled for a Para. `para_id`
      **/
-    CodeUpgradeScheduled: GenericPalletEvent<
-      Rv,
-      'Paras',
-      'CodeUpgradeScheduled',
-      PolkadotParachainPrimitivesPrimitivesId
-    >;
+    CodeUpgradeScheduled: GenericPalletEvent<'Paras', 'CodeUpgradeScheduled', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A new head has been noted for a Para. `para_id`
      **/
-    NewHeadNoted: GenericPalletEvent<Rv, 'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
+    NewHeadNoted: GenericPalletEvent<'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A para has been queued to execute pending actions. `para_id`
      **/
-    ActionQueued: GenericPalletEvent<Rv, 'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
+    ActionQueued: GenericPalletEvent<'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
 
     /**
      * The given para either initiated or subscribed to a PVF check for the given validation
      * code. `code_hash` `para_id`
      **/
     PvfCheckStarted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckStarted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2125,7 +1986,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckAccepted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckAccepted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2136,7 +1996,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckRejected: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckRejected',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2146,7 +2005,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The upgrade cooldown was removed.
      **/
     UpgradeCooldownRemoved: GenericPalletEvent<
-      Rv,
       'Paras',
       'UpgradeCooldownRemoved',
       {
@@ -2161,7 +2019,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new code hash has been authorized for a Para.
      **/
     CodeAuthorized: GenericPalletEvent<
-      Rv,
       'Paras',
       'CodeAuthorized',
       {
@@ -2185,7 +2042,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Hrmp`'s events
@@ -2195,7 +2052,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel requested.
      **/
     OpenChannelRequested: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelRequested',
       {
@@ -2210,7 +2066,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel request sent by the receiver was canceled by either party.
      **/
     OpenChannelCanceled: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelCanceled',
       {
@@ -2223,7 +2078,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel accepted.
      **/
     OpenChannelAccepted: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelAccepted',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2233,7 +2087,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * HRMP channel closed.
      **/
     ChannelClosed: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'ChannelClosed',
       {
@@ -2246,7 +2099,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened via Root origin.
      **/
     HrmpChannelForceOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpChannelForceOpened',
       {
@@ -2261,7 +2113,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened with a system chain.
      **/
     HrmpSystemChannelOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpSystemChannelOpened',
       {
@@ -2276,7 +2127,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel's deposits were updated.
      **/
     OpenChannelDepositsUpdated: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelDepositsUpdated',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2285,7 +2135,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParasDisputes`'s events
@@ -2295,7 +2145,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A dispute has been initiated. \[candidate hash, dispute location\]
      **/
     DisputeInitiated: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeInitiated',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeLocation]
@@ -2306,7 +2155,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `\[para id, candidate hash, dispute result\]`
      **/
     DisputeConcluded: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeConcluded',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeResult]
@@ -2318,12 +2166,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * instead revert the block at the given height. This should be the
      * number of the child of the last known valid block in the chain.
      **/
-    Revert: GenericPalletEvent<Rv, 'ParasDisputes', 'Revert', number>;
+    Revert: GenericPalletEvent<'ParasDisputes', 'Revert', number>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OnDemand`'s events
@@ -2333,7 +2181,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An order was placed at some spot price amount by orderer ordered_by
      **/
     OnDemandOrderPlaced: GenericPalletEvent<
-      Rv,
       'OnDemand',
       'OnDemandOrderPlaced',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; spotPrice: bigint; orderedBy: AccountId32 }
@@ -2342,42 +2189,34 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The value of the spot price has likely changed
      **/
-    SpotPriceSet: GenericPalletEvent<Rv, 'OnDemand', 'SpotPriceSet', { spotPrice: bigint }>;
+    SpotPriceSet: GenericPalletEvent<'OnDemand', 'SpotPriceSet', { spotPrice: bigint }>;
 
     /**
      * An account was given credits.
      **/
-    AccountCredited: GenericPalletEvent<Rv, 'OnDemand', 'AccountCredited', { who: AccountId32; amount: bigint }>;
+    AccountCredited: GenericPalletEvent<'OnDemand', 'AccountCredited', { who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Registrar`'s events
    **/
   registrar: {
     Registered: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Registered',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; manager: AccountId32 }
     >;
-    Deregistered: GenericPalletEvent<
-      Rv,
-      'Registrar',
-      'Deregistered',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    Deregistered: GenericPalletEvent<'Registrar', 'Deregistered', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
     Reserved: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Reserved',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; who: AccountId32 }
     >;
     Swapped: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Swapped',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; otherId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2386,7 +2225,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Slots`'s events
@@ -2395,7 +2234,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new `[lease_period]` is beginning.
      **/
-    NewLeasePeriod: GenericPalletEvent<Rv, 'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
+    NewLeasePeriod: GenericPalletEvent<'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
 
     /**
      * A para has won the right to a continuous set of lease periods as a parachain.
@@ -2403,7 +2242,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Second balance is the total amount reserved.
      **/
     Leased: GenericPalletEvent<
-      Rv,
       'Slots',
       'Leased',
       {
@@ -2419,7 +2257,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Auctions`'s events
@@ -2430,7 +2268,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * close and the first lease period of the quadruplet that is auctioned.
      **/
     AuctionStarted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'AuctionStarted',
       { auctionIndex: number; leasePeriod: number; ending: number }
@@ -2439,14 +2276,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An auction ended. All funds become unreserved.
      **/
-    AuctionClosed: GenericPalletEvent<Rv, 'Auctions', 'AuctionClosed', { auctionIndex: number }>;
+    AuctionClosed: GenericPalletEvent<'Auctions', 'AuctionClosed', { auctionIndex: number }>;
 
     /**
      * Funds were reserved for a winning bid. First balance is the extra amount reserved.
      * Second is the total.
      **/
     Reserved: GenericPalletEvent<
-      Rv,
       'Auctions',
       'Reserved',
       { bidder: AccountId32; extraReserved: bigint; totalAmount: bigint }
@@ -2455,14 +2291,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Funds were unreserved since bidder is no longer active. `[bidder, amount]`
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
 
     /**
      * Someone attempted to lease the same slot twice for a parachain. The amount is held in
      * reserve but no parachain slot has been leased.
      **/
     ReserveConfiscated: GenericPalletEvent<
-      Rv,
       'Auctions',
       'ReserveConfiscated',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; leaser: AccountId32; amount: bigint }
@@ -2472,7 +2307,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new bid has been accepted as the current winner.
      **/
     BidAccepted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'BidAccepted',
       {
@@ -2488,12 +2322,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The winning offset was chosen for an auction. This will map into the `Winning` storage
      * map.
      **/
-    WinningOffset: GenericPalletEvent<Rv, 'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
+    WinningOffset: GenericPalletEvent<'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Crowdloan`'s events
@@ -2502,13 +2336,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Create a new crowdloaning campaign.
      **/
-    Created: GenericPalletEvent<Rv, 'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Created: GenericPalletEvent<'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Contributed to a crowd sale.
      **/
     Contributed: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Contributed',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2518,7 +2351,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdrew full balance of a contributor.
      **/
     Withdrew: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Withdrew',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2529,7 +2361,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * over child keys that still need to be killed.
      **/
     PartiallyRefunded: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'PartiallyRefunded',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2538,23 +2369,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * All loans in a fund have been refunded.
      **/
-    AllRefunded: GenericPalletEvent<
-      Rv,
-      'Crowdloan',
-      'AllRefunded',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    AllRefunded: GenericPalletEvent<'Crowdloan', 'AllRefunded', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Fund is dissolved.
      **/
-    Dissolved: GenericPalletEvent<Rv, 'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Dissolved: GenericPalletEvent<'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * The result of trying to submit a new bid to the Slots pallet.
      **/
     HandleBidResult: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'HandleBidResult',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; result: Result<[], DispatchError> }
@@ -2563,13 +2388,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The configuration to a crowdloan has been edited.
      **/
-    Edited: GenericPalletEvent<Rv, 'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Edited: GenericPalletEvent<'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * A memo has been updated.
      **/
     MemoUpdated: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'MemoUpdated',
       { who: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; memo: Bytes }
@@ -2579,7 +2403,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain has been moved to `NewRaise`
      **/
     AddedToNewRaise: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'AddedToNewRaise',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2588,7 +2411,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Coretime`'s events
@@ -2597,17 +2420,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The broker chain has asked for revenue information for a specific block.
      **/
-    RevenueInfoRequested: GenericPalletEvent<Rv, 'Coretime', 'RevenueInfoRequested', { when: number }>;
+    RevenueInfoRequested: GenericPalletEvent<'Coretime', 'RevenueInfoRequested', { when: number }>;
 
     /**
      * A core has received a new assignment from the broker chain.
      **/
-    CoreAssigned: GenericPalletEvent<Rv, 'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
+    CoreAssigned: GenericPalletEvent<'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -2618,7 +2441,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -2627,22 +2449,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmPallet`'s events
@@ -2651,13 +2473,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'Sent',
       {
@@ -2672,7 +2493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SendFailed',
       {
@@ -2687,7 +2507,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -2699,7 +2518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2710,7 +2528,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -2720,12 +2537,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Query response has been received and query is removed. The registered notification has
      * been dispatched and executed successfully.
      **/
-    Notified: GenericPalletEvent<
-      Rv,
-      'XcmPallet',
-      'Notified',
-      { queryId: bigint; palletIndex: number; callIndex: number }
-    >;
+    Notified: GenericPalletEvent<'XcmPallet', 'Notified', { queryId: bigint; palletIndex: number; callIndex: number }>;
 
     /**
      * Query response has been received and query is removed. The registered notification
@@ -2733,7 +2545,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyOverweight',
       {
@@ -2750,7 +2561,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2762,7 +2572,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -2774,7 +2583,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -2790,7 +2598,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2799,13 +2606,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2817,7 +2623,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2828,7 +2633,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -2839,7 +2643,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -2850,7 +2653,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -2866,7 +2668,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -2878,7 +2679,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerier',
       {
@@ -2894,7 +2694,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2904,7 +2703,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2915,7 +2713,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -2925,7 +2722,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -2935,7 +2731,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -2944,14 +2739,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'XcmPallet', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'XcmPallet', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -2961,7 +2755,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -2971,7 +2764,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -2980,7 +2772,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -2990,7 +2782,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -3018,7 +2809,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -3053,7 +2843,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -3083,7 +2872,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -3102,26 +2890,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3130,7 +2915,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RcMigrator`'s events
@@ -3140,7 +2925,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A stage transition has occurred.
      **/
     StageTransition: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'StageTransition',
       {
@@ -3164,7 +2948,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The activation is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationStarted: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationStarted', null>;
+    AssetHubMigrationStarted: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationStarted', null>;
 
     /**
      * The Asset Hub Migration finished.
@@ -3173,13 +2957,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * to understand. The finishing is immediate and affects all events happening
      * afterwards.
      **/
-    AssetHubMigrationFinished: GenericPalletEvent<Rv, 'RcMigrator', 'AssetHubMigrationFinished', null>;
+    AssetHubMigrationFinished: GenericPalletEvent<'RcMigrator', 'AssetHubMigrationFinished', null>;
 
     /**
      * A query response has been received.
      **/
     QueryResponseReceived: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'QueryResponseReceived',
       {
@@ -3199,7 +2982,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A XCM message has been resent.
      **/
     XcmResendAttempt: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmResendAttempt',
       {
@@ -3219,7 +3001,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The unprocessed message buffer size has been set.
      **/
     UnprocessedMsgBufferSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'UnprocessedMsgBufferSet',
       {
@@ -3239,7 +3020,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Whether the AH UMP queue was prioritized for the next block.
      **/
     AhUmpQueuePrioritySet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePrioritySet',
       {
@@ -3266,7 +3046,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The AH UMP queue priority config was set.
      **/
     AhUmpQueuePriorityConfigSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AhUmpQueuePriorityConfigSet',
       {
@@ -3286,7 +3065,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The total issuance was recorded.
      **/
     MigratedBalanceRecordSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceRecordSet',
       { kept: bigint; migrated: bigint }
@@ -3296,7 +3074,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The RC kept balance was consumed.
      **/
     MigratedBalanceConsumed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigratedBalanceConsumed',
       { kept: bigint; migrated: bigint }
@@ -3306,7 +3083,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager account id was set.
      **/
     ManagerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerSet',
       {
@@ -3326,7 +3102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message was sent.
      **/
     XcmSent: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'XcmSent',
       {
@@ -3340,13 +3115,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The staking elections were paused.
      **/
-    StakingElectionsPaused: GenericPalletEvent<Rv, 'RcMigrator', 'StakingElectionsPaused', null>;
+    StakingElectionsPaused: GenericPalletEvent<'RcMigrator', 'StakingElectionsPaused', null>;
 
     /**
      * The accounts to be preserved on Relay Chain were set.
      **/
     AccountsPreserved: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'AccountsPreserved',
       {
@@ -3361,7 +3135,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The canceller account id was set.
      **/
     CancellerSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'CancellerSet',
       {
@@ -3381,7 +3154,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The migration was paused.
      **/
     MigrationPaused: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigrationPaused',
       {
@@ -3395,13 +3167,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The migration was cancelled.
      **/
-    MigrationCancelled: GenericPalletEvent<Rv, 'RcMigrator', 'MigrationCancelled', null>;
+    MigrationCancelled: GenericPalletEvent<'RcMigrator', 'MigrationCancelled', null>;
 
     /**
      * Some pure accounts were indexed for possibly receiving free `Any` proxies.
      **/
     PureAccountsIndexed: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'PureAccountsIndexed',
       {
@@ -3416,7 +3187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The manager multisig dispatched something.
      **/
     ManagerMultisigDispatched: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'ManagerMultisigDispatched',
       { res: Result<[], DispatchError> }
@@ -3425,13 +3195,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The manager multisig received a vote.
      **/
-    ManagerMultisigVoted: GenericPalletEvent<Rv, 'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
+    ManagerMultisigVoted: GenericPalletEvent<'RcMigrator', 'ManagerMultisigVoted', { votes: number }>;
 
     /**
      * The migration settings were set.
      **/
     MigrationSettingsSet: GenericPalletEvent<
-      Rv,
       'RcMigrator',
       'MigrationSettingsSet',
       {
@@ -3450,6 +3219,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/index.d.ts b/packages/chaintypes/src/polkadot/index.d.ts
index 955c198a..ae9fbece 100644
--- a/packages/chaintypes/src/polkadot/index.d.ts
+++ b/packages/chaintypes/src/polkadot/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PolkadotRuntimeRuntimeCall,
@@ -43,26 +43,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PolkadotRuntimeCommonClaimsPrevalidateAttests,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedPolkadotApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: PolkadotApi
  * @specVersion: 2000001
  **/
-export interface PolkadotApi {
-  legacy: VersionedPolkadotApi<RpcLegacy>;
-  v2: VersionedPolkadotApi<RpcV2>;
+export interface PolkadotApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/polkadot/json-rpc.d.ts b/packages/chaintypes/src/polkadot/json-rpc.d.ts
index e84f3571..c021a2b3 100644
--- a/packages/chaintypes/src/polkadot/json-rpc.d.ts
+++ b/packages/chaintypes/src/polkadot/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -103,4 +103,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/polkadot/query.d.ts b/packages/chaintypes/src/polkadot/query.d.ts
index ebdb0701..e41e3f52 100644
--- a/packages/chaintypes/src/polkadot/query.d.ts
+++ b/packages/chaintypes/src/polkadot/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -155,7 +155,7 @@ import type {
   PolkadotRuntimeRuntimeCallLike,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -166,35 +166,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -202,7 +202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -210,28 +210,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -244,14 +244,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -268,21 +268,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -290,21 +290,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -317,12 +317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -333,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -341,7 +341,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -349,11 +349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -364,12 +360,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -383,7 +379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -391,19 +387,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -414,14 +410,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -429,14 +425,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -452,28 +448,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -488,7 +484,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -496,7 +492,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -504,7 +500,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -514,7 +510,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -525,7 +521,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -536,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -544,7 +540,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -552,7 +548,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -566,12 +562,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -582,7 +578,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -592,12 +588,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -609,12 +605,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -625,14 +621,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -663,7 +659,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -674,7 +670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -684,7 +680,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -692,7 +688,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -701,7 +697,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -709,7 +704,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -719,18 +714,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -741,12 +736,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -757,14 +752,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -773,7 +768,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -783,28 +778,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -813,7 +808,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -824,7 +819,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -834,7 +829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -844,14 +839,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -860,7 +855,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -886,14 +881,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -906,14 +901,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -922,7 +917,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -932,7 +927,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -942,7 +937,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -953,7 +948,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -968,7 +963,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -988,7 +983,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -1015,7 +1009,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -1032,7 +1025,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -1048,7 +1040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -1061,7 +1053,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1074,7 +1065,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1083,7 +1074,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1092,14 +1083,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1108,7 +1099,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1117,7 +1108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1125,7 +1116,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1133,7 +1124,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1143,7 +1134,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1153,7 +1144,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1165,7 +1155,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1177,7 +1166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1190,7 +1178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1202,7 +1189,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1211,12 +1198,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -1228,7 +1215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -1237,7 +1224,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -1245,7 +1231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -1257,19 +1243,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1280,14 +1266,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1295,7 +1281,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1303,7 +1289,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PolkadotRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PolkadotRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PolkadotRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1314,7 +1300,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1322,7 +1308,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PolkadotRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => PolkadotRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PolkadotRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1331,7 +1317,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1339,7 +1324,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1350,28 +1335,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1379,7 +1364,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1396,19 +1381,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -1419,19 +1404,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1445,7 +1430,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1456,14 +1441,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1473,14 +1458,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1488,19 +1473,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1514,7 +1499,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1527,12 +1511,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1543,7 +1527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1551,7 +1535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1562,7 +1546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1570,7 +1554,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1583,12 +1567,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1599,12 +1583,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1615,13 +1599,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -1632,11 +1616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -1645,7 +1625,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -1656,12 +1635,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1673,11 +1652,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -1686,12 +1661,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1704,11 +1679,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1716,16 +1687,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1738,7 +1705,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1746,7 +1712,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -1757,7 +1723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -1765,7 +1731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -1773,19 +1739,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -1797,7 +1763,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -1806,7 +1772,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -1814,7 +1780,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -1823,7 +1789,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -1836,7 +1801,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -1848,7 +1813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -1856,12 +1821,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -1877,14 +1842,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -1893,7 +1858,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -1903,7 +1868,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -1913,7 +1878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -1923,7 +1888,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -1938,7 +1903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -1950,7 +1915,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -1965,7 +1930,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -1978,12 +1942,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -1997,14 +1961,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2014,7 +1978,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2022,7 +1986,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2032,12 +1996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2052,14 +2016,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2072,7 +2036,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2080,7 +2044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2088,7 +2052,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2096,7 +2060,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2105,7 +2069,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2116,7 +2080,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2126,7 +2089,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2134,14 +2097,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2150,14 +2113,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2166,14 +2129,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2181,21 +2144,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2206,14 +2169,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2221,16 +2184,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -2243,7 +2202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -2253,14 +2212,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -2274,12 +2233,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2295,7 +2254,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2305,7 +2263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2313,23 +2271,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingAhClient`'s storage queries
@@ -2342,17 +2296,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    validatorSet: GenericStorageQuery<Rv, () => [number, Array<AccountId32>] | undefined>;
+    validatorSet: GenericStorageQuery<() => [number, Array<AccountId32>] | undefined>;
 
     /**
      * An incomplete validator set report.
      *
      * @param {Callback<PalletStakingAsyncRcClientValidatorSetReport | undefined> =} callback
      **/
-    incompleteValidatorSetReport: GenericStorageQuery<
-      Rv,
-      () => PalletStakingAsyncRcClientValidatorSetReport | undefined
-    >;
+    incompleteValidatorSetReport: GenericStorageQuery<() => PalletStakingAsyncRcClientValidatorSetReport | undefined>;
 
     /**
      * All of the points of the validators.
@@ -2363,7 +2314,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    validatorPoints: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    validatorPoints: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Indicates the current operating mode of the pallet.
@@ -2373,7 +2324,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncAhClientOperatingMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletStakingAsyncAhClientOperatingMode>;
+    mode: GenericStorageQuery<() => PalletStakingAsyncAhClientOperatingMode>;
 
     /**
      * A storage value that is set when a `new_session` gives a new validator set to the session
@@ -2387,7 +2338,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextSessionChangesValidators: GenericStorageQuery<Rv, () => number | undefined>;
+    nextSessionChangesValidators: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The session index at which the latest elected validator set was applied.
@@ -2397,7 +2348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetAppliedAt: GenericStorageQuery<Rv, () => number | undefined>;
+    validatorSetAppliedAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A session report that is outgoing, and should be sent.
@@ -2407,7 +2358,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientSessionReport, number] | undefined> =} callback
      **/
-    outgoingSessionReport: GenericStorageQuery<Rv, () => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
+    outgoingSessionReport: GenericStorageQuery<() => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
 
     /**
      * Internal storage item of [`OffenceSendQueue`]. Should not be used manually.
@@ -2416,7 +2367,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, PalletStakingAsyncRcClientOffence]>> =} callback
      **/
     offenceSendQueueOffences: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<[number, PalletStakingAsyncRcClientOffence]>,
       number
     >;
@@ -2426,12 +2376,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    offenceSendQueueCursor: GenericStorageQuery<Rv, () => number>;
+    offenceSendQueueCursor: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Configuration`'s storage queries
@@ -2442,7 +2392,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsConfigurationHostConfiguration> =} callback
      **/
-    activeConfig: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
+    activeConfig: GenericStorageQuery<() => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
 
     /**
      * Pending configuration changes.
@@ -2455,10 +2405,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>> =} callback
      **/
-    pendingConfigs: GenericStorageQuery<
-      Rv,
-      () => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>
-    >;
+    pendingConfigs: GenericStorageQuery<() => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>>;
 
     /**
      * If this is set, then the configuration setters will bypass the consistency checks. This
@@ -2466,12 +2413,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    bypassConsistencyCheck: GenericStorageQuery<Rv, () => boolean>;
+    bypassConsistencyCheck: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasShared`'s storage queries
@@ -2482,7 +2429,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * All the validators actively participating in parachain consensus.
@@ -2490,7 +2437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex>> =} callback
      **/
-    activeValidatorIndices: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorIndex>>;
+    activeValidatorIndices: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorIndex>>;
 
     /**
      * The parachain attestation keys of the validators actively participating in parachain
@@ -2498,19 +2445,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorAppPublic>> =} callback
      **/
-    activeValidatorKeys: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
+    activeValidatorKeys: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
 
     /**
      * All allowed relay-parents.
      *
      * @param {Callback<PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker> =} callback
      **/
-    allowedRelayParents: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
+    allowedRelayParents: GenericStorageQuery<() => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInclusion`'s storage queries
@@ -2527,7 +2474,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined> =} callback
      **/
     v1: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined,
@@ -2537,7 +2483,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInherent`'s storage queries
@@ -2553,19 +2499,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    included: GenericStorageQuery<Rv, () => [] | undefined>;
+    included: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Scraped on chain data for extracting resolved disputes as well as backing votes.
      *
      * @param {Callback<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined> =} callback
      **/
-    onChainVotes: GenericStorageQuery<Rv, () => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
+    onChainVotes: GenericStorageQuery<() => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaScheduler`'s storage queries
@@ -2582,7 +2528,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Array<PolkadotPrimitivesV8ValidatorIndex>>> =} callback
      **/
-    validatorGroups: GenericStorageQuery<Rv, () => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    validatorGroups: GenericStorageQuery<() => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * The block number where the session start occurred. Used to track how many group rotations
@@ -2595,7 +2541,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    sessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * One entry for each availability core. The `VecDeque` represents the assignments to be
@@ -2604,14 +2550,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>> =} callback
      **/
     claimQueue: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Paras`'s storage queries
@@ -2627,7 +2572,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined> =} callback
      **/
     pvfActiveVoteMap: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined,
@@ -2639,7 +2583,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>> =} callback
      **/
-    pvfActiveVoteList: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
+    pvfActiveVoteList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
 
     /**
      * All lease holding parachains. Ordered ascending by `ParaId`. On demand parachains are not
@@ -2649,7 +2593,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachains: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The current lifecycle of a all known Para IDs.
@@ -2658,7 +2602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaLifecycle | undefined> =} callback
      **/
     paraLifecycles: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaLifecycle | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2670,7 +2613,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesHeadData | undefined> =} callback
      **/
     heads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesHeadData | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2682,7 +2624,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     mostRecentContext: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2696,7 +2637,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     currentCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2713,7 +2653,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     pastCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: [PolkadotParachainPrimitivesPrimitivesId, number],
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2729,7 +2668,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaPastCodeMeta> =} callback
      **/
     pastCodeMeta: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaPastCodeMeta,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2744,7 +2682,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    pastCodePruning: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    pastCodePruning: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The block number at which the planned code change is expected for a parachain.
@@ -2756,7 +2694,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     futureCodeUpgrades: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2773,7 +2710,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    futureCodeUpgradesAt: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    futureCodeUpgradesAt: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actual future code hash of a para.
@@ -2784,7 +2721,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     futureCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2798,7 +2734,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined> =} callback
      **/
     authorizedCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined,
@@ -2821,7 +2756,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
     upgradeGoAheadSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeGoAhead | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2841,7 +2775,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
     upgradeRestrictionSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeRestriction | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2853,7 +2786,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upgradeCooldowns: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upgradeCooldowns: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The list of upcoming code upgrades.
@@ -2865,7 +2798,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upcomingUpgrades: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upcomingUpgrades: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actions to perform during the start of a specific session index.
@@ -2873,7 +2806,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    actionsQueue: GenericStorageQuery<Rv, (arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
+    actionsQueue: GenericStorageQuery<(arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
 
     /**
      * Upcoming paras instantiation arguments.
@@ -2885,7 +2818,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaGenesisArgs | undefined> =} callback
      **/
     upcomingParasGenesis: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaGenesisArgs | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2897,7 +2829,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     codeByHashRefs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => number,
       PolkadotParachainPrimitivesPrimitivesValidationCodeHash
     >;
@@ -2912,7 +2843,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined> =} callback
      **/
     codeByHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCode | undefined,
@@ -2922,7 +2852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Initializer`'s storage queries
@@ -2940,7 +2870,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    hasInitialized: GenericStorageQuery<Rv, () => [] | undefined>;
+    hasInitialized: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Buffered session changes.
@@ -2953,15 +2883,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>> =} callback
      **/
-    bufferedSessionChanges: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>
-    >;
+    bufferedSessionChanges: GenericStorageQuery<() => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dmp`'s storage queries
@@ -2974,7 +2901,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundDownwardMessage>> =} callback
      **/
     downwardMessageQueues: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotCorePrimitivesInboundDownwardMessage>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2992,7 +2918,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256> =} callback
      **/
     downwardMessageQueueHeads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => H256,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3004,7 +2929,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3012,7 +2936,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hrmp`'s storage queries
@@ -3030,7 +2954,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined> =} callback
      **/
     hrmpOpenChannelRequests: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
       ) => PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined,
@@ -3041,10 +2964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpOpenChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpOpenChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * This mapping tracks how many open channel requests are initiated by a given sender para.
@@ -3055,7 +2975,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpOpenChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3069,7 +2988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpAcceptedChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3087,7 +3005,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     hrmpCloseChannelRequests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => [] | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3096,10 +3013,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpCloseChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpCloseChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * The HRMP watermark associated with each para.
@@ -3111,7 +3025,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     hrmpWatermarks: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3125,7 +3038,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpChannel | undefined> =} callback
      **/
     hrmpChannels: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => PolkadotRuntimeParachainsHrmpHrmpChannel | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3149,7 +3061,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpIngressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3160,7 +3071,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpEgressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3173,7 +3083,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundHrmpMessage>> =} callback
      **/
     hrmpChannelContents: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => Array<PolkadotCorePrimitivesInboundHrmpMessage>,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3190,7 +3099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>> =} callback
      **/
     hrmpChannelDigests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3198,7 +3106,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaSessionInfo`'s storage queries
@@ -3211,14 +3119,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8AssignmentAppPublic>> =} callback
      **/
-    assignmentKeysUnsafe: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
+    assignmentKeysUnsafe: GenericStorageQuery<() => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
 
     /**
      * The earliest session for which previous session info is stored.
      *
      * @param {Callback<number> =} callback
      **/
-    earliestStoredSession: GenericStorageQuery<Rv, () => number>;
+    earliestStoredSession: GenericStorageQuery<() => number>;
 
     /**
      * Session information in a rolling window.
@@ -3228,7 +3136,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8SessionInfo | undefined> =} callback
      **/
-    sessions: GenericStorageQuery<Rv, (arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
+    sessions: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
 
     /**
      * The validator account keys of the validators actively participating in parachain consensus.
@@ -3236,7 +3144,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
-    accountKeys: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32> | undefined, number>;
+    accountKeys: GenericStorageQuery<(arg: number) => Array<AccountId32> | undefined, number>;
 
     /**
      * Executor parameter set for a given session index
@@ -3244,16 +3152,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8ExecutorParams | undefined> =} callback
      **/
-    sessionExecutorParams: GenericStorageQuery<
-      Rv,
-      (arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined,
-      number
-    >;
+    sessionExecutorParams: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasDisputes`'s storage queries
@@ -3265,7 +3169,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastPrunedSession: GenericStorageQuery<Rv, () => number | undefined>;
+    lastPrunedSession: GenericStorageQuery<() => number | undefined>;
 
     /**
      * All ongoing or concluded disputes for the last several sessions.
@@ -3274,7 +3178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8DisputeState | undefined> =} callback
      **/
     disputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesV8DisputeState | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3287,7 +3190,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex> | undefined> =} callback
      **/
     backersOnDisputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => Array<PolkadotPrimitivesV8ValidatorIndex> | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3300,7 +3202,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     included: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => number | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3313,12 +3214,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    frozen: GenericStorageQuery<Rv, () => number | undefined>;
+    frozen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasSlashing`'s storage queries
@@ -3331,7 +3232,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesVstagingPendingSlashes | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesVstagingPendingSlashes | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3342,12 +3242,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetCounts: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    validatorSetCounts: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OnDemand`'s storage queries
@@ -3362,7 +3262,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined> =} callback
      **/
     paraIdAffinity: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined,
@@ -3374,14 +3273,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesQueueStatusType> =} callback
      **/
-    queueStatus: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
+    queueStatus: GenericStorageQuery<() => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
 
     /**
      * Priority queue for all orders which don't yet (or not any more) have any core affinity.
      *
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
-    freeEntries: GenericStorageQuery<Rv, () => BinaryHeapEnqueuedOrder>;
+    freeEntries: GenericStorageQuery<() => BinaryHeapEnqueuedOrder>;
 
     /**
      * Queue entries that are currently bound to a particular core due to core affinity.
@@ -3390,7 +3289,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
     affinityEntries: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => BinaryHeapEnqueuedOrder,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3400,7 +3298,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<bigint>> =} callback
      **/
-    revenue: GenericStorageQuery<Rv, () => Array<bigint>>;
+    revenue: GenericStorageQuery<() => Array<bigint>>;
 
     /**
      * Keeps track of credits owned by each account.
@@ -3408,12 +3306,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    credits: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    credits: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s storage queries
@@ -3429,7 +3327,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined> =} callback
      **/
     coreSchedules: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotPrimitivesV8CoreIndex]) => PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined,
       [number, PolkadotPrimitivesV8CoreIndex]
     >;
@@ -3444,7 +3341,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor> =} callback
      **/
     coreDescriptors: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3452,7 +3348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Registrar`'s storage queries
@@ -3465,7 +3361,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId | undefined> =} callback
      **/
     pendingSwap: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesId | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3480,7 +3375,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonParasRegistrarParaInfo | undefined> =} callback
      **/
     paras: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonParasRegistrarParaInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3490,12 +3384,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    nextFreeParaId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    nextFreeParaId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Slots`'s storage queries
@@ -3523,7 +3417,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint] | undefined>> =} callback
      **/
     leases: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[AccountId32, bigint] | undefined>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3531,7 +3424,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Auctions`'s storage queries
@@ -3542,7 +3435,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    auctionCounter: GenericStorageQuery<Rv, () => number>;
+    auctionCounter: GenericStorageQuery<() => number>;
 
     /**
      * Information relating to the current auction, if there is one.
@@ -3553,7 +3446,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    auctionInfo: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    auctionInfo: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Amounts currently reserved in the accounts of the bidders currently winning
@@ -3563,7 +3456,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     reservedAmounts: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PolkadotParachainPrimitivesPrimitivesId]) => bigint | undefined,
       [AccountId32, PolkadotParachainPrimitivesPrimitivesId]
     >;
@@ -3577,7 +3469,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined> =} callback
      **/
     winning: GenericStorageQuery<
-      Rv,
       (
         arg: number,
       ) => FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined,
@@ -3587,7 +3478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Crowdloan`'s storage queries
@@ -3600,7 +3491,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonCrowdloanFundInfo | undefined> =} callback
      **/
     funds: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonCrowdloanFundInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3611,26 +3501,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    newRaise: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    newRaise: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The number of auctions that have entered into their ending period so far.
      *
      * @param {Callback<number> =} callback
      **/
-    endingsCount: GenericStorageQuery<Rv, () => number>;
+    endingsCount: GenericStorageQuery<() => number>;
 
     /**
      * Tracker for the next available fund index
      *
      * @param {Callback<number> =} callback
      **/
-    nextFundIndex: GenericStorageQuery<Rv, () => number>;
+    nextFundIndex: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -3644,7 +3534,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -3653,7 +3543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -3662,12 +3552,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmPallet`'s storage queries
@@ -3678,7 +3568,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -3686,7 +3576,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -3697,7 +3587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -3705,7 +3595,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -3714,7 +3604,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3726,7 +3615,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3739,7 +3627,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3751,14 +3638,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -3767,7 +3654,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -3779,7 +3665,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -3789,7 +3674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -3802,7 +3687,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -3814,7 +3699,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -3825,7 +3710,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -3833,7 +3717,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -3846,7 +3730,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin) => PalletMessageQueueBookState,
       PolkadotRuntimeParachainsInclusionAggregateMessageOrigin
     >;
@@ -3856,7 +3739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -3865,7 +3748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]
     >;
@@ -3873,7 +3755,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3888,7 +3770,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3896,7 +3777,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -3907,21 +3788,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -3938,7 +3819,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -3947,12 +3828,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -3963,14 +3844,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -3981,12 +3862,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BeefyMmrLeaf`'s storage queries
@@ -3997,7 +3878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -4006,12 +3887,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RcMigrator`'s storage queries
@@ -4022,7 +3903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorMigrationStage> =} callback
      **/
-    rcMigrationStage: GenericStorageQuery<Rv, () => PalletRcMigratorMigrationStage>;
+    rcMigrationStage: GenericStorageQuery<() => PalletRcMigratorMigrationStage>;
 
     /**
      * Helper storage item to obtain and store the known accounts that should be kept partially or
@@ -4032,7 +3913,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRcMigratorAccountsAccountState | undefined> =} callback
      **/
     rcAccounts: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletRcMigratorAccountsAccountState | undefined,
       AccountId32
     >;
@@ -4042,14 +3922,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRcAccounts: GenericStorageQuery<Rv, () => number>;
+    counterForRcAccounts: GenericStorageQuery<() => number>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain.
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalance: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalance: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * Helper storage item to store the total balance that should be kept on Relay Chain after
@@ -4061,7 +3941,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorAccountsMigratedBalances> =} callback
      **/
-    rcMigratedBalanceArchive: GenericStorageQuery<Rv, () => PalletRcMigratorAccountsMigratedBalances>;
+    rcMigratedBalanceArchive: GenericStorageQuery<() => PalletRcMigratorAccountsMigratedBalances>;
 
     /**
      * The pending XCM messages.
@@ -4073,14 +3953,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, H256]} arg
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    pendingXcmMessages: GenericStorageQuery<Rv, (arg: [bigint, H256]) => StagingXcmV5Xcm | undefined, [bigint, H256]>;
+    pendingXcmMessages: GenericStorageQuery<(arg: [bigint, H256]) => StagingXcmV5Xcm | undefined, [bigint, H256]>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingXcmMessages: GenericStorageQuery<Rv, () => number>;
+    counterForPendingXcmMessages: GenericStorageQuery<() => number>;
 
     /**
      * Accounts that use the proxy pallet to delegate permissions and have no nonce.
@@ -4090,7 +3970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    pureProxyCandidatesMigrated: GenericStorageQuery<Rv, (arg: AccountId32Like) => boolean | undefined, AccountId32>;
+    pureProxyCandidatesMigrated: GenericStorageQuery<(arg: AccountId32Like) => boolean | undefined, AccountId32>;
 
     /**
      * The pending XCM response queries and their XCM hash referencing the message in the
@@ -4104,14 +3984,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pendingXcmQueries: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    pendingXcmQueries: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Manual override for `type UnprocessedMsgBuffer: Get<u32>`. Look there for docs.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    unprocessedMsgBuffer: GenericStorageQuery<Rv, () => number | undefined>;
+    unprocessedMsgBuffer: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The priority of the Asset Hub UMP queue during migration.
@@ -4123,7 +4003,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    ahUmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    ahUmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -4133,7 +4013,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * An optional account id of a canceller.
@@ -4142,7 +4022,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    canceller: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    canceller: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -4152,7 +4032,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -4162,7 +4042,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The duration of the pre migration warm-up period.
@@ -4172,7 +4052,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    warmUpPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    warmUpPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      * The duration of the post migration cool-off period.
@@ -4183,14 +4063,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportScheduleDispatchTime | undefined> =} callback
      **/
-    coolOffPeriod: GenericStorageQuery<Rv, () => FrameSupportScheduleDispatchTime | undefined>;
+    coolOffPeriod: GenericStorageQuery<() => FrameSupportScheduleDispatchTime | undefined>;
 
     /**
      * The migration settings.
      *
      * @param {Callback<PalletRcMigratorMigrationSettings | undefined> =} callback
      **/
-    settings: GenericStorageQuery<Rv, () => PalletRcMigratorMigrationSettings | undefined>;
+    settings: GenericStorageQuery<() => PalletRcMigratorMigrationSettings | undefined>;
 
     /**
      * The multisig AccountIDs that votes to execute a specific call.
@@ -4199,7 +4079,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32>> =} callback
      **/
     managerMultisigs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeRuntimeCallLike) => Array<AccountId32>,
       PolkadotRuntimeRuntimeCall
     >;
@@ -4211,7 +4090,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    managerMultisigRound: GenericStorageQuery<Rv, () => number>;
+    managerMultisigRound: GenericStorageQuery<() => number>;
 
     /**
      * How often each participant voted in the current round.
@@ -4221,11 +4100,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    managerVotesInCurrentRound: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    managerVotesInCurrentRound: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/runtime.d.ts b/packages/chaintypes/src/polkadot/runtime.d.ts
index 202dae4c..c74f578c 100644
--- a/packages/chaintypes/src/polkadot/runtime.d.ts
+++ b/packages/chaintypes/src/polkadot/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -92,7 +92,7 @@ import type {
   XcmRuntimeApisConversionsError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Inflation - 0xc51ff1fa3f5d0cca
    **/
@@ -105,12 +105,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Inflation_experimental_inflation_prediction_info
      **/
-    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<Rv, () => Promise<RelayCommonApisInflationInfo>>;
+    experimentalInflationPredictionInfo: GenericRuntimeApiMethod<() => Promise<RelayCommonApisInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -121,7 +121,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -129,7 +129,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -137,12 +137,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -153,7 +153,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -164,7 +164,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -173,12 +173,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -194,7 +194,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -205,7 +204,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -214,7 +213,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -226,14 +224,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -245,7 +242,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -254,7 +251,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -263,7 +260,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -271,7 +268,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -282,7 +279,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -297,7 +294,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -311,7 +308,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -319,7 +316,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -327,7 +324,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -335,12 +332,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -352,7 +349,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -361,7 +358,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -370,12 +367,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -398,7 +395,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -411,7 +407,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -423,12 +419,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ParachainHost - 0xaf2c0297a23e6d3d
@@ -439,7 +435,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validators
      **/
-    validators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
+    validators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
 
     /**
      * Returns the validator groups and rotation info localized based on the hypothetical child
@@ -449,7 +445,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_validator_groups
      **/
     validatorGroups: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<[Array<Array<PolkadotPrimitivesV8ValidatorIndex>>, PolkadotPrimitivesV8GroupRotationInfo]>
     >;
 
@@ -459,7 +454,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_availability_cores
      **/
-    availabilityCores: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
+    availabilityCores: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
 
     /**
      * Yields the persisted validation data for the given `ParaId` along with an assumption that
@@ -473,7 +468,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     persistedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -490,7 +484,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} expected_persisted_validation_data_hash
      **/
     assumedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         expectedPersistedValidationDataHash: H256,
@@ -508,7 +501,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8CandidateCommitments} outputs
      **/
     checkValidationOutputs: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         outputs: PolkadotPrimitivesV8CandidateCommitments,
@@ -522,7 +514,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_session_index_for_child
      **/
-    sessionIndexForChild: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    sessionIndexForChild: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Fetch the validation code used by a para, making the given `OccupiedCoreAssumption`.
@@ -535,7 +527,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCode: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -550,7 +541,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatePendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2 | undefined>
@@ -561,7 +551,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_candidate_events
      **/
-    candidateEvents: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
+    candidateEvents: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
 
     /**
      * Get all the pending inbound messages in the downward message queue for a para.
@@ -570,7 +560,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     dmqContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotCorePrimitivesInboundDownwardMessage>>
@@ -584,7 +573,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     inboundHrmpChannelsContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<[PolkadotParachainPrimitivesPrimitivesId, Array<PolkadotCorePrimitivesInboundHrmpMessage>]>>
@@ -597,7 +585,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} hash
      **/
     validationCodeByHash: GenericRuntimeApiMethod<
-      Rv,
       (
         hash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => Promise<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined>
@@ -608,7 +595,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_on_chain_votes
      **/
-    onChainVotes: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
+    onChainVotes: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
 
     /**
      * Get the session info for the given session, if stored.
@@ -618,7 +605,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_session_info
      * @param {number} index
      **/
-    sessionInfo: GenericRuntimeApiMethod<Rv, (index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
+    sessionInfo: GenericRuntimeApiMethod<(index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
 
     /**
      * Submits a PVF pre-checking statement into the transaction pool.
@@ -630,7 +617,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     submitPvfCheckStatement: GenericRuntimeApiMethod<
-      Rv,
       (stmt: PolkadotPrimitivesV8PvfCheckStatement, signature: PolkadotPrimitivesV8ValidatorAppSignature) => Promise<[]>
     >;
 
@@ -642,7 +628,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_pvfs_require_precheck
      **/
     pvfsRequirePrecheck: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>
     >;
 
@@ -656,7 +641,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCodeHash: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -669,7 +653,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_disputes
      **/
     disputes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8DisputeState]>>
     >;
 
@@ -680,7 +663,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session_index
      **/
     sessionExecutorParams: GenericRuntimeApiMethod<
-      Rv,
       (sessionIndex: number) => Promise<PolkadotPrimitivesV8ExecutorParams | undefined>
     >;
 
@@ -691,7 +673,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_unapplied_slashes
      **/
     unappliedSlashes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8SlashingPendingSlashes]>>
     >;
 
@@ -703,7 +684,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppPublic} validator_id
      **/
     keyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         validatorId: PolkadotPrimitivesV8ValidatorAppPublic,
       ) => Promise<PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof | undefined>
@@ -719,7 +699,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof} key_ownership_proof
      **/
     submitReportDisputeLost: GenericRuntimeApiMethod<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesV8SlashingDisputeProof,
         keyOwnershipProof: PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof,
@@ -732,7 +711,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_minimum_backing_votes
      **/
-    minimumBackingVotes: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    minimumBackingVotes: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the state of parachain backing for a given para.
@@ -741,7 +720,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} __runtime_api_generated_name_0__
      **/
     paraBackingState: GenericRuntimeApiMethod<
-      Rv,
       (
         runtimeApiGeneratedName0: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingBackingState | undefined>
@@ -752,14 +730,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_async_backing_params
      **/
-    asyncBackingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
+    asyncBackingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
 
     /**
      * Returns a list of all disabled validators at the given block.
      *
      * @callname: ParachainHost_disabled_validators
      **/
-    disabledValidators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    disabledValidators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * Get node features.
@@ -767,14 +745,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_node_features
      **/
-    nodeFeatures: GenericRuntimeApiMethod<Rv, () => Promise<BitSequence>>;
+    nodeFeatures: GenericRuntimeApiMethod<() => Promise<BitSequence>>;
 
     /**
      * Approval voting configuration parameters
      *
      * @callname: ParachainHost_approval_voting_params
      **/
-    approvalVotingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
+    approvalVotingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
 
     /**
      * Claim queue
@@ -782,7 +760,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_claim_queue
      **/
     claimQueue: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotParachainPrimitivesPrimitivesId>]>>
     >;
 
@@ -793,7 +770,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatesPendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2>>
@@ -804,7 +780,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validation_code_bomb_limit
      **/
-    validationCodeBombLimit: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    validationCodeBombLimit: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the constraints on the actions that can be taken by a new parachain
@@ -814,7 +790,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     backingConstraints: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingConstraints | undefined>
@@ -825,12 +800,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_scheduling_lookahead
      **/
-    schedulingLookahead: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    schedulingLookahead: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyApi - 0x49eaaf1b548a0cb0
@@ -841,14 +816,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyApi_beefy_genesis
      **/
-    beefyGenesis: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    beefyGenesis: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Return the current active BEEFY validator set
      *
      * @callname: BeefyApi_validator_set
      **/
-    validatorSet: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyValidatorSet | undefined>>;
+    validatorSet: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyValidatorSet | undefined>>;
 
     /**
      * Submits an unsigned extrinsic to report a double voting equivocation. The caller
@@ -865,7 +840,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportDoubleVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -887,7 +861,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportForkVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProofOpaqueValue,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -909,7 +882,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportFutureBlockVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -934,7 +906,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBeefyEcdsaCryptoPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusBeefyEcdsaCryptoPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -947,14 +918,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateAncestryProof: GenericRuntimeApiMethod<
-      Rv,
       (prevBlockNumber: number, bestKnownBlockNumber?: number | undefined) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MmrApi - 0x91d5df18b0d2cf58
@@ -965,14 +935,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MmrApi_mmr_root
      **/
-    mmrRoot: GenericRuntimeApiMethod<Rv, () => Promise<Result<H256, SpMmrPrimitivesError>>>;
+    mmrRoot: GenericRuntimeApiMethod<() => Promise<Result<H256, SpMmrPrimitivesError>>>;
 
     /**
      * Return the number of MMR blocks in the chain.
      *
      * @callname: MmrApi_mmr_leaf_count
      **/
-    mmrLeafCount: GenericRuntimeApiMethod<Rv, () => Promise<Result<bigint, SpMmrPrimitivesError>>>;
+    mmrLeafCount: GenericRuntimeApiMethod<() => Promise<Result<bigint, SpMmrPrimitivesError>>>;
 
     /**
      * Generate MMR proof for a series of block numbers. If `best_known_block_number = Some(n)`,
@@ -983,7 +953,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateProof: GenericRuntimeApiMethod<
-      Rv,
       (
         blockNumbers: Array<number>,
         bestKnownBlockNumber?: number | undefined,
@@ -1002,7 +971,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProof: GenericRuntimeApiMethod<
-      Rv,
       (
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
         proof: SpMmrPrimitivesLeafProof,
@@ -1024,7 +992,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProofStateless: GenericRuntimeApiMethod<
-      Rv,
       (
         root: H256,
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
@@ -1035,7 +1002,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyMmrApi - 0x2a5e924655399e60
@@ -1046,19 +1013,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyMmrApi_authority_set_proof
      **/
-    authoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    authoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Return the next/queued BEEFY authority set proof.
      *
      * @callname: BeefyMmrApi_next_authority_set_proof
      **/
-    nextAuthoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    nextAuthoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -1074,7 +1041,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -1091,7 +1058,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -1116,7 +1082,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -1125,12 +1090,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
@@ -1141,21 +1106,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -1163,7 +1128,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -1183,7 +1148,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -1205,7 +1169,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -1215,7 +1178,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -1226,12 +1189,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -1249,7 +1212,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -1260,14 +1223,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -1281,7 +1243,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -1291,7 +1252,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -1303,12 +1264,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -1321,7 +1282,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1332,7 +1292,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1341,19 +1300,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -1367,7 +1326,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PolkadotRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1379,7 +1337,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PolkadotRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1389,7 +1346,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -1397,12 +1354,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -1419,7 +1376,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -1434,7 +1390,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -1451,7 +1406,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -1470,7 +1424,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -1480,7 +1433,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -1495,7 +1448,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PolkadotRuntimeOriginCaller,
         call: PolkadotRuntimeRuntimeCallLike,
@@ -1511,7 +1463,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -1521,7 +1472,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -1534,14 +1485,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1562,7 +1512,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1583,7 +1533,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1593,11 +1543,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/tx.d.ts b/packages/chaintypes/src/polkadot/tx.d.ts
index eaec354f..14b56717 100644
--- a/packages/chaintypes/src/polkadot/tx.d.ts
+++ b/packages/chaintypes/src/polkadot/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -104,16 +102,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PolkadotRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PolkadotRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -126,16 +126,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -145,16 +144,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -164,16 +162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -186,16 +183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -205,16 +201,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -224,16 +219,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -247,19 +241,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -269,16 +262,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -291,16 +283,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -317,16 +308,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -344,23 +334,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -375,14 +364,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -394,7 +381,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -405,19 +393,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -431,7 +418,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -439,7 +425,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -452,7 +437,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -462,16 +448,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -484,14 +469,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -503,7 +486,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -517,7 +501,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -525,7 +508,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -538,7 +520,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -561,20 +544,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -597,20 +579,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -620,16 +601,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -639,23 +619,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -670,16 +649,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -694,16 +672,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -716,16 +693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -737,16 +713,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -758,23 +733,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -790,19 +764,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -820,19 +793,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -845,23 +817,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -891,23 +862,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -930,16 +900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -961,19 +930,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -994,16 +962,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1027,20 +994,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1061,16 +1027,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1089,23 +1054,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -1124,19 +1088,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1149,20 +1112,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1178,19 +1140,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1215,19 +1176,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1240,19 +1200,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1269,16 +1228,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1291,19 +1249,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1318,19 +1275,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1347,26 +1303,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -1394,19 +1349,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1429,16 +1383,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1468,16 +1421,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1509,16 +1461,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1532,16 +1483,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1560,16 +1510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1587,15 +1536,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1616,16 +1564,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1647,15 +1594,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1670,16 +1616,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1695,16 +1640,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1720,16 +1664,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1750,15 +1693,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1780,15 +1722,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1800,16 +1741,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1827,19 +1767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1856,15 +1795,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1880,19 +1818,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1915,19 +1852,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1943,16 +1879,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1980,19 +1915,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2012,16 +1946,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2053,7 +1986,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -2063,7 +1995,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2078,7 +2009,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2113,16 +2045,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2134,16 +2065,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2156,16 +2086,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2193,20 +2122,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2221,16 +2149,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2246,16 +2173,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2278,14 +2204,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2297,7 +2221,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2313,16 +2238,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2354,27 +2278,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} slashFraction
      **/
     manualSlash: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         slashFraction: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ManualSlash';
             params: { validatorStash: AccountId32Like; era: number; slashFraction: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2395,19 +2318,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PolkadotRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PolkadotRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2427,22 +2349,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -2458,19 +2379,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2489,19 +2409,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2523,26 +2442,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -2571,19 +2489,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2613,16 +2530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2660,14 +2576,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: XcmVersionedLocation,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -2679,7 +2593,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2709,16 +2624,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2748,16 +2662,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2782,23 +2695,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -2819,19 +2731,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2866,14 +2777,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -2885,7 +2794,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2908,16 +2818,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2936,19 +2845,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2987,19 +2895,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3026,27 +2933,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -3068,13 +2974,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: PolkadotRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -3085,7 +2989,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3102,16 +3007,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3127,16 +3031,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3151,16 +3054,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3175,16 +3077,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3197,16 +3098,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3224,16 +3124,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3249,16 +3148,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3275,26 +3173,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -3305,16 +3202,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3323,16 +3219,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3343,20 +3238,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3365,23 +3259,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: PolkadotRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Claims`'s transaction calls
@@ -3417,19 +3310,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsEcdsaSignature} ethereumSignature
      **/
     claim: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Claim';
             params: { dest: AccountId32Like; ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3456,14 +3348,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonClaimsStatementKind | undefined} statement
      **/
     mintClaim: GenericTxCall<
-      Rv,
       (
         who: EthereumAddressLike,
         value: bigint,
         vestingSchedule: [bigint, bigint, number] | undefined,
         statement: PolkadotRuntimeCommonClaimsStatementKind | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3475,7 +3365,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: PolkadotRuntimeCommonClaimsStatementKind | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3513,13 +3404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     claimAttest: GenericTxCall<
-      Rv,
       (
         dest: AccountId32Like,
         ethereumSignature: PolkadotRuntimeCommonClaimsEcdsaSignature,
         statement: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
@@ -3530,7 +3419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               statement: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3558,16 +3448,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} statement
      **/
     attest: GenericTxCall<
-      Rv,
       (statement: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'Attest';
             params: { statement: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3578,27 +3467,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} maybePreclaim
      **/
     moveClaim: GenericTxCall<
-      Rv,
       (
         old: EthereumAddressLike,
         new_: EthereumAddressLike,
         maybePreclaim: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Claims';
           palletCall: {
             name: 'MoveClaim';
             params: { old: EthereumAddressLike; new: EthereumAddressLike; maybePreclaim: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -3617,15 +3505,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3645,16 +3532,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3677,19 +3563,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3714,20 +3599,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3758,19 +3642,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3786,26 +3669,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -3834,16 +3716,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PolkadotRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3866,19 +3747,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3900,16 +3780,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PolkadotRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3925,19 +3804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PolkadotRuntimeOriginCaller,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PolkadotRuntimeOriginCaller; call: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3959,16 +3837,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PolkadotRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PolkadotRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PolkadotRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3984,19 +3861,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PolkadotRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PolkadotRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4029,19 +3905,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PolkadotRuntimeRuntimeCallLike,
         fallback: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PolkadotRuntimeRuntimeCallLike; fallback: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4056,26 +3931,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PolkadotRuntimeOriginCaller,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PolkadotRuntimeOriginCaller; call: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -4097,13 +3971,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PolkadotRuntimeConstantsProxyProxyType | undefined,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4114,7 +3986,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4134,20 +4007,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PolkadotRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PolkadotRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4165,20 +4037,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PolkadotRuntimeConstantsProxyProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PolkadotRuntimeConstantsProxyProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4192,15 +4063,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4229,20 +4099,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PolkadotRuntimeConstantsProxyProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PolkadotRuntimeConstantsProxyProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4271,7 +4140,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PolkadotRuntimeConstantsProxyProxyType,
@@ -4279,7 +4147,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4292,7 +4159,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4317,19 +4185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4349,19 +4216,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4381,19 +4247,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4416,14 +4281,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PolkadotRuntimeConstantsProxyProxyType | undefined,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4435,7 +4298,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PolkadotRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4451,22 +4315,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -4490,19 +4353,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PolkadotRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PolkadotRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4554,7 +4416,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4562,7 +4423,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PolkadotRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4575,7 +4435,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4618,7 +4479,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4626,7 +4486,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4639,7 +4498,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4672,14 +4532,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4691,7 +4549,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4715,27 +4574,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -4759,19 +4617,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4787,16 +4644,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4813,20 +4669,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4852,16 +4707,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4877,16 +4731,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4906,19 +4759,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4935,16 +4787,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4962,16 +4813,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4990,19 +4840,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5024,20 +4873,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5061,23 +4909,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'PokeDeposit';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -5109,20 +4956,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5149,21 +4995,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5192,19 +5037,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5248,19 +5092,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5288,20 +5131,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5327,19 +5169,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5371,26 +5212,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -5416,12 +5256,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -5431,7 +5269,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5445,16 +5284,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5471,16 +5309,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5498,16 +5335,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5519,22 +5355,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -5555,16 +5390,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5583,16 +5417,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5605,26 +5438,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -5652,19 +5484,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5680,16 +5511,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5705,15 +5535,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5754,19 +5583,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5782,19 +5610,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5826,19 +5653,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5867,21 +5693,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5900,7 +5725,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -5908,7 +5732,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -5921,7 +5744,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5943,19 +5767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5975,19 +5798,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6001,19 +5823,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6038,7 +5859,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -6047,7 +5867,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6061,7 +5880,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6080,14 +5900,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6099,7 +5917,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6125,16 +5944,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6153,19 +5971,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6181,16 +5998,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6203,16 +6019,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6227,19 +6042,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6254,19 +6068,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6280,19 +6093,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6317,16 +6129,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6342,16 +6153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6365,19 +6175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6395,16 +6204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6422,16 +6230,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6449,23 +6256,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -6501,15 +6307,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6535,15 +6340,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6565,23 +6369,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingAhClient`'s transaction calls
@@ -6592,16 +6395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientValidatorSetReport} report
      **/
     validatorSet: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientValidatorSetReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ValidatorSet';
             params: { report: PalletStakingAsyncRcClientValidatorSetReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6611,16 +6413,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncAhClientOperatingMode} mode
      **/
     setMode: GenericTxCall<
-      Rv,
       (mode: PalletStakingAsyncAhClientOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'SetMode';
             params: { mode: PalletStakingAsyncAhClientOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6629,22 +6430,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnMigrationEnd: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ForceOnMigrationEnd';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Configuration`'s transaction calls
@@ -6656,16 +6456,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeCooldown: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeCooldown';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6675,16 +6474,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6694,16 +6492,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCodeRetentionPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCodeRetentionPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6713,16 +6510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxCodeSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxCodeSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6732,16 +6528,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxPovSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxPovSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6751,16 +6546,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxHeadDataSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxHeadDataSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6773,16 +6567,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCoretimeCores: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCoretimeCores';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6792,16 +6585,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setGroupRotationFrequency: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetGroupRotationFrequency';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6811,16 +6603,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setParasAvailabilityPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetParasAvailabilityPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6830,16 +6621,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setSchedulingLookahead: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulingLookahead';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6849,16 +6639,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidatorsPerCore: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidatorsPerCore';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6868,16 +6657,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidators: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidators';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6887,16 +6675,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6906,16 +6693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePostConclusionAcceptancePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePostConclusionAcceptancePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6926,16 +6712,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNoShowSlots: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNoShowSlots';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6945,16 +6730,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNDelayTranches: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNDelayTranches';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6964,16 +6748,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setZerothDelayTrancheWidth: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetZerothDelayTrancheWidth';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6983,16 +6766,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNeededApprovals: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNeededApprovals';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7002,16 +6784,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setRelayVrfModuloSamples: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetRelayVrfModuloSamples';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7021,16 +6802,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7041,16 +6821,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7060,16 +6839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxDownwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxDownwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7079,16 +6857,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7098,16 +6875,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7117,16 +6893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpOpenRequestTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpOpenRequestTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7136,16 +6911,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpSenderDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpSenderDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7156,16 +6930,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpRecipientDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpRecipientDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7175,16 +6948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxCapacity: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxCapacity';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7194,16 +6966,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxTotalSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxTotalSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7213,16 +6984,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainInboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainInboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7232,16 +7002,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7251,16 +7020,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainOutboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainOutboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7270,16 +7038,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7289,16 +7056,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setPvfVotingTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetPvfVotingTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7311,16 +7077,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7331,16 +7096,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} new_
      **/
     setBypassConsistencyCheck: GenericTxCall<
-      Rv,
       (new_: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetBypassConsistencyCheck';
             params: { new: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7350,16 +7114,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8AsyncBackingAsyncBackingParams} new_
      **/
     setAsyncBackingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetAsyncBackingParams';
             params: { new: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7369,16 +7132,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ExecutorParams} new_
      **/
     setExecutorParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ExecutorParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetExecutorParams';
             params: { new: PolkadotPrimitivesV8ExecutorParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7388,16 +7150,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setOnDemandBaseFee: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandBaseFee';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7407,16 +7168,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandFeeVariability: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandFeeVariability';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7426,16 +7186,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setOnDemandQueueMaxSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandQueueMaxSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7445,16 +7204,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandTargetQueueUtilization: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandTargetQueueUtilization';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7464,16 +7222,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumBackingVotes: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumBackingVotes';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7484,19 +7241,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     setNodeFeature: GenericTxCall<
-      Rv,
       (
         index: number,
         value: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNodeFeature';
             params: { index: number; value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7506,16 +7262,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ApprovalVotingParams} new_
      **/
     setApprovalVotingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ApprovalVotingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetApprovalVotingParams';
             params: { new: PolkadotPrimitivesV8ApprovalVotingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7525,23 +7280,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8SchedulerParams} new_
      **/
     setSchedulerParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8SchedulerParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulerParams';
             params: { new: PolkadotPrimitivesV8SchedulerParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasShared`'s transaction calls
@@ -7550,7 +7304,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInclusion`'s transaction calls
@@ -7559,7 +7313,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInherent`'s transaction calls
@@ -7571,23 +7325,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesVstagingInherentData} data
      **/
     enter: GenericTxCall<
-      Rv,
       (data: PolkadotPrimitivesVstagingInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaInherent';
           palletCall: {
             name: 'Enter';
             params: { data: PolkadotPrimitivesVstagingInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Paras`'s transaction calls
@@ -7600,12 +7353,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     forceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7615,7 +7366,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7626,12 +7378,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceSetCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7641,7 +7391,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7653,13 +7404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} relayParentNumber
      **/
     forceScheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
         relayParentNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7670,7 +7419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               relayParentNumber: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7681,12 +7431,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceNoteNewHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7696,7 +7444,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7708,16 +7457,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     forceQueueAction: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceQueueAction';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7740,16 +7488,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     addTrustedValidationCode: GenericTxCall<
-      Rv,
       (validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'AddTrustedValidationCode';
             params: { validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7763,16 +7510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} validationCodeHash
      **/
     pokeUnusedValidationCode: GenericTxCall<
-      Rv,
       (validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'PokeUnusedValidationCode';
             params: { validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7784,12 +7530,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     includePvfCheckStatement: GenericTxCall<
-      Rv,
       (
         stmt: PolkadotPrimitivesV8PvfCheckStatement,
         signature: PolkadotPrimitivesV8ValidatorAppSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7799,7 +7543,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: PolkadotPrimitivesV8ValidatorAppSignature;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7810,19 +7555,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} context
      **/
     forceSetMostRecentContext: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         context: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceSetMostRecentContext';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; context: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7835,16 +7579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeUpgradeCooldown: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'RemoveUpgradeCooldown';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7866,13 +7609,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} validPeriod
      **/
     authorizeForceSetCurrentCodeHash: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
         validPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7883,7 +7624,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validPeriod: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7895,12 +7637,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     applyAuthorizedForceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7910,14 +7650,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Initializer`'s transaction calls
@@ -7931,23 +7672,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} upTo
      **/
     forceApprove: GenericTxCall<
-      Rv,
       (upTo: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Initializer';
           palletCall: {
             name: 'ForceApprove';
             params: { upTo: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Hrmp`'s transaction calls
@@ -7970,13 +7710,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposedMaxMessageSize
      **/
     hrmpInitOpenChannel: GenericTxCall<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         proposedMaxCapacity: number,
         proposedMaxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -7987,7 +7725,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proposedMaxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7999,16 +7738,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} sender
      **/
     hrmpAcceptOpenChannel: GenericTxCall<
-      Rv,
       (sender: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpAcceptOpenChannel';
             params: { sender: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8021,16 +7759,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHrmpChannelId} channelId
      **/
     hrmpCloseChannel: GenericTxCall<
-      Rv,
       (channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCloseChannel';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8048,20 +7785,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numOutbound
      **/
     forceCleanHrmp: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         numInbound: number,
         numOutbound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceCleanHrmp';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; numInbound: number; numOutbound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8078,16 +7814,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpOpen: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpOpen';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8104,16 +7839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpClose: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpClose';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8131,19 +7865,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} openRequests
      **/
     hrmpCancelOpenRequest: GenericTxCall<
-      Rv,
       (
         channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
         openRequests: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCancelOpenRequest';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId; openRequests: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8163,14 +7896,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     forceOpenHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8182,7 +7913,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8204,12 +7936,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     establishSystemChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8219,7 +7949,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8238,12 +7969,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     pokeChannelDeposits: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8253,7 +7982,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8269,23 +7999,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} targetSystemChain
      **/
     establishChannelWithSystem: GenericTxCall<
-      Rv,
       (targetSystemChain: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'EstablishChannelWithSystem';
             params: { targetSystemChain: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasDisputes`'s transaction calls
@@ -8295,20 +8024,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceUnfreeze: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasDisputes';
           palletCall: 'ForceUnfreeze';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasSlashing`'s transaction calls
@@ -8320,26 +8048,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDisputeLostUnsigned: GenericTxCall<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesVstagingDisputeProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSlashing';
           palletCall: {
             name: 'ReportDisputeLostUnsigned';
             params: { disputeProof: PolkadotPrimitivesVstagingDisputeProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OnDemand`'s transaction calls
@@ -8368,19 +8095,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderAllowDeath: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderAllowDeath';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8407,19 +8133,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderKeepAlive: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderKeepAlive';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8446,26 +8171,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     placeOrderWithCredits: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemand';
           palletCall: {
             name: 'PlaceOrderWithCredits';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Registrar`'s transaction calls
@@ -8498,13 +8222,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     register: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8515,7 +8237,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8534,7 +8257,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     forceRegister: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         deposit: bigint,
@@ -8542,7 +8264,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8555,7 +8276,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8568,16 +8290,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     deregister: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Deregister';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8599,19 +8320,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} other
      **/
     swap: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         other: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Swap';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; other: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8624,16 +8344,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'RemoveLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8658,15 +8377,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     reserve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Reserve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8680,16 +8398,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     addLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'AddLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8710,12 +8427,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     scheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8725,7 +8440,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8739,12 +8455,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     setCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8754,14 +8468,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Slots`'s transaction calls
@@ -8780,7 +8495,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} periodCount
      **/
     forceLease: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         leaser: AccountId32Like,
@@ -8788,7 +8502,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         periodBegin: number,
         periodCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
@@ -8801,7 +8514,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               periodCount: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8813,16 +8527,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     clearAllLeases: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'ClearAllLeases';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8838,23 +8551,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     triggerOnboard: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'TriggerOnboard';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Auctions`'s transaction calls
@@ -8871,19 +8583,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} leasePeriodIndex
      **/
     newAuction: GenericTxCall<
-      Rv,
       (
         duration: number,
         leasePeriodIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'NewAuction';
             params: { duration: number; leasePeriodIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8912,7 +8623,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     bid: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         auctionIndex: number,
@@ -8920,7 +8630,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         lastSlot: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
@@ -8933,7 +8642,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8944,22 +8654,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelAuction: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'CancelAuction';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Crowdloan`'s transaction calls
@@ -8980,7 +8689,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     create: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -8989,7 +8697,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9003,7 +8710,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9016,13 +8724,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contribute: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         value: bigint,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9033,7 +8739,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: SpRuntimeMultiSignature | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9060,19 +8767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         index: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Withdraw';
             params: { who: AccountId32Like; index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9086,16 +8792,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     refund: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Refund';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9105,16 +8810,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     dissolve: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Dissolve';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9131,7 +8835,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     edit: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -9140,7 +8843,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9154,7 +8856,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9167,19 +8870,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} memo
      **/
     addMemo: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         memo: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'AddMemo';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; memo: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9191,16 +8893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     poke: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Poke';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9213,26 +8914,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contributeAll: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'ContributeAll';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Coretime`'s transaction calls
@@ -9249,16 +8949,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} count
      **/
     requestCoreCount: GenericTxCall<
-      Rv,
       (count: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestCoreCount';
             params: { count: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9271,16 +8970,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     requestRevenueAt: GenericTxCall<
-      Rv,
       (when: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestRevenueAt';
             params: { when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9290,19 +8988,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     creditAccount: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'CreditAccount';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9323,7 +9020,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} endHint
      **/
     assignCore: GenericTxCall<
-      Rv,
       (
         core: number,
         begin: number,
@@ -9332,7 +9028,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         >,
         endHint: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
@@ -9346,14 +9041,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               endHint: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -9367,16 +9063,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9408,13 +9103,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -9425,7 +9118,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9439,19 +9133,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9468,20 +9161,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9491,16 +9183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9519,26 +9210,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmPallet`'s transaction calls
@@ -9550,19 +9240,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9594,14 +9283,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9613,7 +9300,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9657,14 +9345,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9676,7 +9362,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9694,19 +9381,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9722,19 +9408,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9748,16 +9433,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9770,16 +9454,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9794,16 +9477,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9846,7 +9528,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9854,7 +9535,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9867,7 +9547,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9898,7 +9579,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9906,7 +9586,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -9919,7 +9598,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9932,16 +9612,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9987,7 +9666,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -9995,7 +9673,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10008,7 +9685,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10024,19 +9702,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10099,7 +9776,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -10109,7 +9785,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10124,7 +9799,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10145,19 +9821,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10168,16 +9843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10187,22 +9861,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -10215,19 +9888,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10252,14 +9924,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -10271,14 +9941,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -10294,19 +9965,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10320,19 +9990,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10345,23 +10014,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Beefy`'s transaction calls
@@ -10377,19 +10045,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVoting';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10408,19 +10075,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10433,16 +10099,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayInBlocks
      **/
     setNewGenesis: GenericTxCall<
-      Rv,
       (delayInBlocks: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'SetNewGenesis';
             params: { delayInBlocks: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10455,19 +10120,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVoting';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10485,19 +10149,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10510,12 +10173,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -10525,7 +10186,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10543,12 +10205,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -10558,14 +10218,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RcMigrator`'s transaction calls
@@ -10580,16 +10241,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorMigrationStage} stage
      **/
     forceSetStage: GenericTxCall<
-      Rv,
       (stage: PalletRcMigratorMigrationStage) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ForceSetStage';
             params: { stage: PalletRcMigratorMigrationStage };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10622,14 +10282,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} unsafeIgnoreStakingLockCheck
      **/
     scheduleMigration: GenericTxCall<
-      Rv,
       (
         start: FrameSupportScheduleDispatchTime,
         warmUp: FrameSupportScheduleDispatchTime,
         coolOff: FrameSupportScheduleDispatchTime,
         unsafeIgnoreStakingLockCheck: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
@@ -10641,7 +10299,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               unsafeIgnoreStakingLockCheck: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10653,15 +10312,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     startDataMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'StartDataMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10672,19 +10330,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Response} response
      **/
     receiveQueryResponse: GenericTxCall<
-      Rv,
       (
         queryId: bigint,
         response: StagingXcmV5Response,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ReceiveQueryResponse';
             params: { queryId: bigint; response: StagingXcmV5Response };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10694,16 +10351,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} queryId
      **/
     resendXcm: GenericTxCall<
-      Rv,
       (queryId: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'ResendXcm';
             params: { queryId: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10715,16 +10371,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setUnprocessedMsgBuffer: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetUnprocessedMsgBuffer';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10736,16 +10391,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorQueuePriority} new_
      **/
     setAhUmpQueuePriority: GenericTxCall<
-      Rv,
       (new_: PalletRcMigratorQueuePriority) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetAhUmpQueuePriority';
             params: { new: PalletRcMigratorQueuePriority };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10758,16 +10412,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setManager: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetManager';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10780,19 +10433,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     sendXcmMessage: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SendXcmMessage';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10804,16 +10456,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} accounts
      **/
     preserveAccounts: GenericTxCall<
-      Rv,
       (accounts: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PreserveAccounts';
             params: { accounts: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10825,16 +10476,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} new_
      **/
     setCanceller: GenericTxCall<
-      Rv,
       (new_: AccountId32Like | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetCanceller';
             params: { new: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10843,15 +10493,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pauseMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'PauseMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10862,15 +10511,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelMigration: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'CancelMigration';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10889,19 +10537,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature} sig
      **/
     voteManagerMultisig: GenericTxCall<
-      Rv,
       (
         payload: PalletRcMigratorManagerMultisigVote,
         sig: SpRuntimeMultiSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'VoteManagerMultisig';
             params: { payload: PalletRcMigratorManagerMultisigVote; sig: SpRuntimeMultiSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10911,22 +10558,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletRcMigratorMigrationSettings | undefined} settings
      **/
     setSettings: GenericTxCall<
-      Rv,
       (settings: PalletRcMigratorMigrationSettings | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RcMigrator';
           palletCall: {
             name: 'SetSettings';
             params: { settings: PalletRcMigratorMigrationSettings | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/polkadot/view-functions.d.ts b/packages/chaintypes/src/polkadot/view-functions.d.ts
index 10ce3024..191e334b 100644
--- a/packages/chaintypes/src/polkadot/view-functions.d.ts
+++ b/packages/chaintypes/src/polkadot/view-functions.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type {
   PolkadotRuntimeRuntimeCallLike,
@@ -8,7 +8,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -20,7 +20,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PolkadotRuntimeConstantsProxyProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PolkadotRuntimeRuntimeCallLike, proxyType: PolkadotRuntimeConstantsProxyProxyType) => Promise<boolean>
     >;
 
@@ -31,7 +30,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PolkadotRuntimeConstantsProxyProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (
         toCheck: PolkadotRuntimeConstantsProxyProxyType,
         against: PolkadotRuntimeConstantsProxyProxyType,
@@ -41,7 +39,7 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -58,12 +56,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `Paras`'s view functions
@@ -74,14 +72,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
-    removeUpgradeCooldownCost: GenericViewFunction<
-      Rv,
-      (para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>
-    >;
+    removeUpgradeCooldownCost: GenericViewFunction<(para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/substrate/consts.d.ts b/packages/chaintypes/src/substrate/consts.d.ts
index b6eeb1af..04063bb0 100644
--- a/packages/chaintypes/src/substrate/consts.d.ts
+++ b/packages/chaintypes/src/substrate/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type {
   RuntimeVersion,
   Perbill,
@@ -25,7 +25,7 @@ import type {
   FrameSupportTokensFungibleUnionOfNativeOrWithId,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/substrate/errors.d.ts b/packages/chaintypes/src/substrate/errors.d.ts
index 01d3c10c..b0d7c390 100644
--- a/packages/chaintypes/src/substrate/errors.d.ts
+++ b/packages/chaintypes/src/substrate/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -68,12 +68,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -82,27 +82,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -111,32 +111,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -145,67 +145,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -214,82 +214,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -298,182 +298,182 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -482,32 +482,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Democracy`'s errors
@@ -516,128 +516,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Value too low
      **/
-    ValueLow: GenericPalletError<Rv>;
+    ValueLow: GenericPalletError;
 
     /**
      * Proposal does not exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Cannot cancel the same proposal twice
      **/
-    AlreadyCanceled: GenericPalletError<Rv>;
+    AlreadyCanceled: GenericPalletError;
 
     /**
      * Proposal already made
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal still blacklisted
      **/
-    ProposalBlacklisted: GenericPalletError<Rv>;
+    ProposalBlacklisted: GenericPalletError;
 
     /**
      * Next external proposal not simple majority
      **/
-    NotSimpleMajority: GenericPalletError<Rv>;
+    NotSimpleMajority: GenericPalletError;
 
     /**
      * Invalid hash
      **/
-    InvalidHash: GenericPalletError<Rv>;
+    InvalidHash: GenericPalletError;
 
     /**
      * No external proposal
      **/
-    NoProposal: GenericPalletError<Rv>;
+    NoProposal: GenericPalletError;
 
     /**
      * Identity may not veto a proposal twice
      **/
-    AlreadyVetoed: GenericPalletError<Rv>;
+    AlreadyVetoed: GenericPalletError;
 
     /**
      * Vote given for invalid referendum
      **/
-    ReferendumInvalid: GenericPalletError<Rv>;
+    ReferendumInvalid: GenericPalletError;
 
     /**
      * No proposals waiting
      **/
-    NoneWaiting: GenericPalletError<Rv>;
+    NoneWaiting: GenericPalletError;
 
     /**
      * The given account did not vote on the referendum.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed, either through `unvote` or `reap_vote`.
      **/
-    VotesExist: GenericPalletError<Rv>;
+    VotesExist: GenericPalletError;
 
     /**
      * The instant referendum origin is currently disallowed.
      **/
-    InstantNotAllowed: GenericPalletError<Rv>;
+    InstantNotAllowed: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Invalid upper bound.
      **/
-    WrongUpperBound: GenericPalletError<Rv>;
+    WrongUpperBound: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * Maximum number of items reached.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Voting period too low
      **/
-    VotingPeriodLow: GenericPalletError<Rv>;
+    VotingPeriodLow: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Council`'s errors
@@ -646,67 +646,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalCommittee`'s errors
@@ -715,67 +715,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Elections`'s errors
@@ -784,92 +784,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Cannot vote when no candidates or members exist.
      **/
-    UnableToVote: GenericPalletError<Rv>;
+    UnableToVote: GenericPalletError;
 
     /**
      * Must vote for at least one candidate.
      **/
-    NoVotes: GenericPalletError<Rv>;
+    NoVotes: GenericPalletError;
 
     /**
      * Cannot vote more than candidates.
      **/
-    TooManyVotes: GenericPalletError<Rv>;
+    TooManyVotes: GenericPalletError;
 
     /**
      * Cannot vote more than maximum allowed.
      **/
-    MaximumVotesExceeded: GenericPalletError<Rv>;
+    MaximumVotesExceeded: GenericPalletError;
 
     /**
      * Cannot vote with stake less than minimum balance.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * Voter can not pay voting bond.
      **/
-    UnableToPayBond: GenericPalletError<Rv>;
+    UnableToPayBond: GenericPalletError;
 
     /**
      * Must be a voter.
      **/
-    MustBeVoter: GenericPalletError<Rv>;
+    MustBeVoter: GenericPalletError;
 
     /**
      * Duplicated candidate submission.
      **/
-    DuplicatedCandidate: GenericPalletError<Rv>;
+    DuplicatedCandidate: GenericPalletError;
 
     /**
      * Too many candidates have been created.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Member cannot re-submit candidacy.
      **/
-    MemberSubmit: GenericPalletError<Rv>;
+    MemberSubmit: GenericPalletError;
 
     /**
      * Runner cannot re-submit candidacy.
      **/
-    RunnerUpSubmit: GenericPalletError<Rv>;
+    RunnerUpSubmit: GenericPalletError;
 
     /**
      * Candidate does not have enough funds.
      **/
-    InsufficientCandidateFunds: GenericPalletError<Rv>;
+    InsufficientCandidateFunds: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * The provided count of number of candidates is incorrect.
      **/
-    InvalidWitnessData: GenericPalletError<Rv>;
+    InvalidWitnessData: GenericPalletError;
 
     /**
      * The provided count of number of votes is incorrect.
      **/
-    InvalidVoteCount: GenericPalletError<Rv>;
+    InvalidVoteCount: GenericPalletError;
 
     /**
      * The renouncing origin presented a wrong `Renouncing` parameter.
      **/
-    InvalidRenouncing: GenericPalletError<Rv>;
+    InvalidRenouncing: GenericPalletError;
 
     /**
      * Prediction regarding replacement after member removal is wrong.
      **/
-    InvalidReplacement: GenericPalletError<Rv>;
+    InvalidReplacement: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TechnicalMembership`'s errors
@@ -878,22 +878,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Too many members.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -903,43 +903,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -948,63 +948,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -1013,22 +1013,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Contracts`'s errors
@@ -1037,120 +1037,120 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * The output buffer supplied to a contract API call was too small.
      **/
-    OutputBufferTooSmall: GenericPalletError<Rv>;
+    OutputBufferTooSmall: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * The code supplied to `instantiate_with_code` exceeds the limit specified in the
      * current schedule.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * The size defined in `T::MaxValueSize` was exceeded.
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The subject passed to `seal_random` exceeds the limit.
      **/
-    RandomSubjectTooLong: GenericPalletError<Rv>;
+    RandomSubjectTooLong: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * The chain does not provide a chain extension. Calling the chain extension results
      * in this error. Note that this usually shouldn't happen as deploying such contracts
      * is rejected.
      **/
-    NoChainExtension: GenericPalletError<Rv>;
+    NoChainExtension: GenericPalletError;
 
     /**
      * Failed to decode the XCM program.
      **/
-    XcmDecodeFailed: GenericPalletError<Rv>;
+    XcmDecodeFailed: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
@@ -1158,27 +1158,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * into `pallet-contracts`. This would make the whole pallet reentrant with regard to
      * contract code execution which is not supported.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -1186,7 +1186,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract's code was found to be invalid during validation.
@@ -1198,52 +1198,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::contracts=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * An indeterministic code was used in a context where this is not permitted.
      **/
-    Indeterministic: GenericPalletError<Rv>;
+    Indeterministic: GenericPalletError;
 
     /**
      * A pending migration needs to complete before the extrinsic can be called.
      **/
-    MigrationInProgress: GenericPalletError<Rv>;
+    MigrationInProgress: GenericPalletError;
 
     /**
      * Migrate dispatch call was attempted but no migration was performed.
      **/
-    NoMigrationPerformed: GenericPalletError<Rv>;
+    NoMigrationPerformed: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -1252,12 +1252,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ImOnline`'s errors
@@ -1266,17 +1266,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Non existent public key.
      **/
-    InvalidKey: GenericPalletError<Rv>;
+    InvalidKey: GenericPalletError;
 
     /**
      * Duplicated heartbeat.
      **/
-    DuplicatedHeartbeat: GenericPalletError<Rv>;
+    DuplicatedHeartbeat: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -1285,158 +1285,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Society`'s errors
@@ -1445,167 +1445,167 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * User is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * User is suspended.
      **/
-    Suspended: GenericPalletError<Rv>;
+    Suspended: GenericPalletError;
 
     /**
      * User is not suspended.
      **/
-    NotSuspended: GenericPalletError<Rv>;
+    NotSuspended: GenericPalletError;
 
     /**
      * Nothing to payout.
      **/
-    NoPayout: GenericPalletError<Rv>;
+    NoPayout: GenericPalletError;
 
     /**
      * Society already founded.
      **/
-    AlreadyFounded: GenericPalletError<Rv>;
+    AlreadyFounded: GenericPalletError;
 
     /**
      * Not enough in pot to accept candidate.
      **/
-    InsufficientPot: GenericPalletError<Rv>;
+    InsufficientPot: GenericPalletError;
 
     /**
      * Member is already vouching or banned from vouching again.
      **/
-    AlreadyVouching: GenericPalletError<Rv>;
+    AlreadyVouching: GenericPalletError;
 
     /**
      * Member is not vouching.
      **/
-    NotVouchingOnBidder: GenericPalletError<Rv>;
+    NotVouchingOnBidder: GenericPalletError;
 
     /**
      * Cannot remove the head of the chain.
      **/
-    Head: GenericPalletError<Rv>;
+    Head: GenericPalletError;
 
     /**
      * Cannot remove the founder.
      **/
-    Founder: GenericPalletError<Rv>;
+    Founder: GenericPalletError;
 
     /**
      * User has already made a bid.
      **/
-    AlreadyBid: GenericPalletError<Rv>;
+    AlreadyBid: GenericPalletError;
 
     /**
      * User is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * User is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * Too many members in the society.
      **/
-    MaxMembers: GenericPalletError<Rv>;
+    MaxMembers: GenericPalletError;
 
     /**
      * The caller is not the founder.
      **/
-    NotFounder: GenericPalletError<Rv>;
+    NotFounder: GenericPalletError;
 
     /**
      * The caller is not the head.
      **/
-    NotHead: GenericPalletError<Rv>;
+    NotHead: GenericPalletError;
 
     /**
      * The membership cannot be claimed as the candidate was not clearly approved.
      **/
-    NotApproved: GenericPalletError<Rv>;
+    NotApproved: GenericPalletError;
 
     /**
      * The candidate cannot be kicked as the candidate was not clearly rejected.
      **/
-    NotRejected: GenericPalletError<Rv>;
+    NotRejected: GenericPalletError;
 
     /**
      * The candidacy cannot be dropped as the candidate was clearly approved.
      **/
-    Approved: GenericPalletError<Rv>;
+    Approved: GenericPalletError;
 
     /**
      * The candidacy cannot be bestowed as the candidate was clearly rejected.
      **/
-    Rejected: GenericPalletError<Rv>;
+    Rejected: GenericPalletError;
 
     /**
      * The candidacy cannot be concluded as the voting is still in progress.
      **/
-    InProgress: GenericPalletError<Rv>;
+    InProgress: GenericPalletError;
 
     /**
      * The candidacy cannot be pruned until a full additional intake period has passed.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The skeptic already voted.
      **/
-    Voted: GenericPalletError<Rv>;
+    Voted: GenericPalletError;
 
     /**
      * The skeptic need not vote on candidates from expired rounds.
      **/
-    Expired: GenericPalletError<Rv>;
+    Expired: GenericPalletError;
 
     /**
      * User is not a bidder.
      **/
-    NotBidder: GenericPalletError<Rv>;
+    NotBidder: GenericPalletError;
 
     /**
      * There is no defender currently.
      **/
-    NoDefender: GenericPalletError<Rv>;
+    NoDefender: GenericPalletError;
 
     /**
      * Group doesn't exist.
      **/
-    NotGroup: GenericPalletError<Rv>;
+    NotGroup: GenericPalletError;
 
     /**
      * The member is already elevated to this rank.
      **/
-    AlreadyElevated: GenericPalletError<Rv>;
+    AlreadyElevated: GenericPalletError;
 
     /**
      * The skeptic has already been punished for this offence.
      **/
-    AlreadyPunished: GenericPalletError<Rv>;
+    AlreadyPunished: GenericPalletError;
 
     /**
      * Funds are insufficient to pay off society debts.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The candidate/defender has no stale votes to remove.
      **/
-    NoVotes: GenericPalletError<Rv>;
+    NoVotes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Recovery`'s errors
@@ -1614,87 +1614,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not allowed to make a call on behalf of this account
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Threshold must be greater than zero
      **/
-    ZeroThreshold: GenericPalletError<Rv>;
+    ZeroThreshold: GenericPalletError;
 
     /**
      * Friends list must be greater than zero and threshold
      **/
-    NotEnoughFriends: GenericPalletError<Rv>;
+    NotEnoughFriends: GenericPalletError;
 
     /**
      * Friends list must be less than max friends
      **/
-    MaxFriends: GenericPalletError<Rv>;
+    MaxFriends: GenericPalletError;
 
     /**
      * Friends list must be sorted and free of duplicates
      **/
-    NotSorted: GenericPalletError<Rv>;
+    NotSorted: GenericPalletError;
 
     /**
      * This account is not set up for recovery
      **/
-    NotRecoverable: GenericPalletError<Rv>;
+    NotRecoverable: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyRecoverable: GenericPalletError<Rv>;
+    AlreadyRecoverable: GenericPalletError;
 
     /**
      * A recovery process has already started for this account
      **/
-    AlreadyStarted: GenericPalletError<Rv>;
+    AlreadyStarted: GenericPalletError;
 
     /**
      * A recovery process has not started for this rescuer
      **/
-    NotStarted: GenericPalletError<Rv>;
+    NotStarted: GenericPalletError;
 
     /**
      * This account is not a friend who can vouch
      **/
-    NotFriend: GenericPalletError<Rv>;
+    NotFriend: GenericPalletError;
 
     /**
      * The friend must wait until the delay period to vouch for this recovery
      **/
-    DelayPeriod: GenericPalletError<Rv>;
+    DelayPeriod: GenericPalletError;
 
     /**
      * This user has already vouched for this recovery
      **/
-    AlreadyVouched: GenericPalletError<Rv>;
+    AlreadyVouched: GenericPalletError;
 
     /**
      * The threshold for recovering this account has not been met
      **/
-    Threshold: GenericPalletError<Rv>;
+    Threshold: GenericPalletError;
 
     /**
      * There are still active recovery attempts that need to be closed
      **/
-    StillActive: GenericPalletError<Rv>;
+    StillActive: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyProxy: GenericPalletError<Rv>;
+    AlreadyProxy: GenericPalletError;
 
     /**
      * Some internal state is broken.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -1703,33 +1703,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -1738,32 +1738,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Glutton`'s errors
@@ -1774,17 +1774,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * Set `witness_count` to `Some` to bypass this error.
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The limit was over [`crate::RESOURCE_HARD_LIMIT`].
      **/
-    InsaneLimit: GenericPalletError<Rv>;
+    InsaneLimit: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -1793,47 +1793,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -1842,47 +1842,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -1891,78 +1891,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -1971,63 +1971,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Tips`'s errors
@@ -2036,42 +2036,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The tip was already found/started.
      **/
-    AlreadyKnown: GenericPalletError<Rv>;
+    AlreadyKnown: GenericPalletError;
 
     /**
      * The tip hash is unknown.
      **/
-    UnknownTip: GenericPalletError<Rv>;
+    UnknownTip: GenericPalletError;
 
     /**
      * The tip given was too generous.
      **/
-    MaxTipAmountExceeded: GenericPalletError<Rv>;
+    MaxTipAmountExceeded: GenericPalletError;
 
     /**
      * The account attempting to retract the tip is not the finder of the tip.
      **/
-    NotFinder: GenericPalletError<Rv>;
+    NotFinder: GenericPalletError;
 
     /**
      * The tip cannot be claimed/closed because there are not enough tippers yet.
      **/
-    StillOpen: GenericPalletError<Rv>;
+    StillOpen: GenericPalletError;
 
     /**
      * The tip cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -2080,125 +2080,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssets`'s errors
@@ -2207,125 +2207,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Beefy`'s errors
@@ -2334,42 +2334,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A double voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidDoubleVotingProof: GenericPalletError<Rv>;
+    InvalidDoubleVotingProof: GenericPalletError;
 
     /**
      * A fork voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidForkVotingProof: GenericPalletError<Rv>;
+    InvalidForkVotingProof: GenericPalletError;
 
     /**
      * A future block voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidFutureBlockVotingProof: GenericPalletError<Rv>;
+    InvalidFutureBlockVotingProof: GenericPalletError;
 
     /**
      * The session of the equivocation proof is invalid
      **/
-    InvalidEquivocationProofSession: GenericPalletError<Rv>;
+    InvalidEquivocationProofSession: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Lottery`'s errors
@@ -2378,42 +2378,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A lottery has not been configured.
      **/
-    NotConfigured: GenericPalletError<Rv>;
+    NotConfigured: GenericPalletError;
 
     /**
      * A lottery is already in progress.
      **/
-    InProgress: GenericPalletError<Rv>;
+    InProgress: GenericPalletError;
 
     /**
      * A lottery has already ended.
      **/
-    AlreadyEnded: GenericPalletError<Rv>;
+    AlreadyEnded: GenericPalletError;
 
     /**
      * The call is not valid for an open lottery.
      **/
-    InvalidCall: GenericPalletError<Rv>;
+    InvalidCall: GenericPalletError;
 
     /**
      * You are already participating in the lottery with this call.
      **/
-    AlreadyParticipating: GenericPalletError<Rv>;
+    AlreadyParticipating: GenericPalletError;
 
     /**
      * Too many calls for a single lottery.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Failed to encode calls
      **/
-    EncodingFailed: GenericPalletError<Rv>;
+    EncodingFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nis`'s errors
@@ -2422,83 +2422,83 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The duration of the bid is less than one.
      **/
-    DurationTooSmall: GenericPalletError<Rv>;
+    DurationTooSmall: GenericPalletError;
 
     /**
      * The duration is the bid is greater than the number of queues.
      **/
-    DurationTooBig: GenericPalletError<Rv>;
+    DurationTooBig: GenericPalletError;
 
     /**
      * The amount of the bid is less than the minimum allowed.
      **/
-    AmountTooSmall: GenericPalletError<Rv>;
+    AmountTooSmall: GenericPalletError;
 
     /**
      * The queue for the bid's duration is full and the amount bid is too low to get in
      * through replacing an existing bid.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * Receipt index is unknown.
      **/
-    UnknownReceipt: GenericPalletError<Rv>;
+    UnknownReceipt: GenericPalletError;
 
     /**
      * Not the owner of the receipt.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Bond not yet at expiry date.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The given bid for retraction is not found.
      **/
-    UnknownBid: GenericPalletError<Rv>;
+    UnknownBid: GenericPalletError;
 
     /**
      * The portion supplied is beyond the value of the receipt.
      **/
-    PortionTooBig: GenericPalletError<Rv>;
+    PortionTooBig: GenericPalletError;
 
     /**
      * Not enough funds are held to pay out.
      **/
-    Unfunded: GenericPalletError<Rv>;
+    Unfunded: GenericPalletError;
 
     /**
      * There are enough funds for what is required.
      **/
-    AlreadyFunded: GenericPalletError<Rv>;
+    AlreadyFunded: GenericPalletError;
 
     /**
      * The thaw throttle has been reached for this period.
      **/
-    Throttled: GenericPalletError<Rv>;
+    Throttled: GenericPalletError;
 
     /**
      * The operation would result in a receipt worth an insignificant value.
      **/
-    MakesDust: GenericPalletError<Rv>;
+    MakesDust: GenericPalletError;
 
     /**
      * The receipt is already communal.
      **/
-    AlreadyCommunal: GenericPalletError<Rv>;
+    AlreadyCommunal: GenericPalletError;
 
     /**
      * The receipt is already private.
      **/
-    AlreadyPrivate: GenericPalletError<Rv>;
+    AlreadyPrivate: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -2507,97 +2507,97 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nfts`'s errors
@@ -2606,232 +2606,232 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The approval had a deadline that expired, so the approval isn't valid anymore.
      **/
-    ApprovalExpired: GenericPalletError<Rv>;
+    ApprovalExpired: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * The witness data given does not match the current state of the chain.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Collection ID is already taken.
      **/
-    CollectionIdInUse: GenericPalletError<Rv>;
+    CollectionIdInUse: GenericPalletError;
 
     /**
      * Items within that collection are non-transferable.
      **/
-    ItemsNonTransferable: GenericPalletError<Rv>;
+    ItemsNonTransferable: GenericPalletError;
 
     /**
      * The provided account is not a delegate.
      **/
-    NotDelegate: GenericPalletError<Rv>;
+    NotDelegate: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership acceptance of the collection.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked (non-transferable).
      **/
-    ItemLocked: GenericPalletError<Rv>;
+    ItemLocked: GenericPalletError;
 
     /**
      * Item's attributes are locked.
      **/
-    LockedItemAttributes: GenericPalletError<Rv>;
+    LockedItemAttributes: GenericPalletError;
 
     /**
      * Collection's attributes are locked.
      **/
-    LockedCollectionAttributes: GenericPalletError<Rv>;
+    LockedCollectionAttributes: GenericPalletError;
 
     /**
      * Item's metadata is locked.
      **/
-    LockedItemMetadata: GenericPalletError<Rv>;
+    LockedItemMetadata: GenericPalletError;
 
     /**
      * Collection's metadata is locked.
      **/
-    LockedCollectionMetadata: GenericPalletError<Rv>;
+    LockedCollectionMetadata: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply is locked and can't be changed.
      **/
-    MaxSupplyLocked: GenericPalletError<Rv>;
+    MaxSupplyLocked: GenericPalletError;
 
     /**
      * The provided max supply is less than the number of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Swap doesn't exist.
      **/
-    UnknownSwap: GenericPalletError<Rv>;
+    UnknownSwap: GenericPalletError;
 
     /**
      * The given item has no metadata set.
      **/
-    MetadataNotFound: GenericPalletError<Rv>;
+    MetadataNotFound: GenericPalletError;
 
     /**
      * The provided attribute can't be found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * The item has reached its approval limit.
      **/
-    ReachedApprovalLimit: GenericPalletError<Rv>;
+    ReachedApprovalLimit: GenericPalletError;
 
     /**
      * The deadline has already expired.
      **/
-    DeadlineExpired: GenericPalletError<Rv>;
+    DeadlineExpired: GenericPalletError;
 
     /**
      * The duration provided should be less than or equal to `MaxDeadlineDuration`.
      **/
-    WrongDuration: GenericPalletError<Rv>;
+    WrongDuration: GenericPalletError;
 
     /**
      * The method is disabled by system settings.
      **/
-    MethodDisabled: GenericPalletError<Rv>;
+    MethodDisabled: GenericPalletError;
 
     /**
      * The provided setting can't be set.
      **/
-    WrongSetting: GenericPalletError<Rv>;
+    WrongSetting: GenericPalletError;
 
     /**
      * Item's config already exists and should be equal to the provided one.
      **/
-    InconsistentItemConfig: GenericPalletError<Rv>;
+    InconsistentItemConfig: GenericPalletError;
 
     /**
      * Config for a collection or an item can't be found.
      **/
-    NoConfig: GenericPalletError<Rv>;
+    NoConfig: GenericPalletError;
 
     /**
      * Some roles were not cleared.
      **/
-    RolesNotCleared: GenericPalletError<Rv>;
+    RolesNotCleared: GenericPalletError;
 
     /**
      * Mint has not started yet.
      **/
-    MintNotStarted: GenericPalletError<Rv>;
+    MintNotStarted: GenericPalletError;
 
     /**
      * Mint has already ended.
      **/
-    MintEnded: GenericPalletError<Rv>;
+    MintEnded: GenericPalletError;
 
     /**
      * The provided Item was already used for claiming.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * The provided data is incorrect.
      **/
-    IncorrectData: GenericPalletError<Rv>;
+    IncorrectData: GenericPalletError;
 
     /**
      * The extrinsic was sent by the wrong origin.
      **/
-    WrongOrigin: GenericPalletError<Rv>;
+    WrongOrigin: GenericPalletError;
 
     /**
      * The provided signature is incorrect.
      **/
-    WrongSignature: GenericPalletError<Rv>;
+    WrongSignature: GenericPalletError;
 
     /**
      * The provided metadata might be too long.
      **/
-    IncorrectMetadata: GenericPalletError<Rv>;
+    IncorrectMetadata: GenericPalletError;
 
     /**
      * Can't set more attributes per one call.
      **/
-    MaxAttributesLimitReached: GenericPalletError<Rv>;
+    MaxAttributesLimitReached: GenericPalletError;
 
     /**
      * The provided namespace isn't supported in this call.
      **/
-    WrongNamespace: GenericPalletError<Rv>;
+    WrongNamespace: GenericPalletError;
 
     /**
      * Can't delete non-empty collections.
      **/
-    CollectionNotEmpty: GenericPalletError<Rv>;
+    CollectionNotEmpty: GenericPalletError;
 
     /**
      * The witness data should be provided.
      **/
-    WitnessRequired: GenericPalletError<Rv>;
+    WitnessRequired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NftFractionalization`'s errors
@@ -2840,27 +2840,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID does not correspond to locked NFT.
      **/
-    IncorrectAssetId: GenericPalletError<Rv>;
+    IncorrectAssetId: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * NFT doesn't exist.
      **/
-    NftNotFound: GenericPalletError<Rv>;
+    NftNotFound: GenericPalletError;
 
     /**
      * NFT has not yet been fractionalised.
      **/
-    NftNotFractionalized: GenericPalletError<Rv>;
+    NftNotFractionalized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Salary`'s errors
@@ -2869,73 +2869,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The salary system has already been started.
      **/
-    AlreadyStarted: GenericPalletError<Rv>;
+    AlreadyStarted: GenericPalletError;
 
     /**
      * The account is not a ranked member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * The account is already inducted.
      **/
-    AlreadyInducted: GenericPalletError<Rv>;
-    NotInducted: GenericPalletError<Rv>;
+    AlreadyInducted: GenericPalletError;
+    NotInducted: GenericPalletError;
 
     /**
      * The member does not have a current valid claim.
      **/
-    NoClaim: GenericPalletError<Rv>;
+    NoClaim: GenericPalletError;
 
     /**
      * The member's claim is zero.
      **/
-    ClaimZero: GenericPalletError<Rv>;
+    ClaimZero: GenericPalletError;
 
     /**
      * Current cycle's registration period is over.
      **/
-    TooLate: GenericPalletError<Rv>;
+    TooLate: GenericPalletError;
 
     /**
      * Current cycle's payment period is not yet begun.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * Cycle is not yet over.
      **/
-    NotYet: GenericPalletError<Rv>;
+    NotYet: GenericPalletError;
 
     /**
      * The payout cycles have not yet started.
      **/
-    NotStarted: GenericPalletError<Rv>;
+    NotStarted: GenericPalletError;
 
     /**
      * There is no budget left for the payout.
      **/
-    Bankrupt: GenericPalletError<Rv>;
+    Bankrupt: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayError: GenericPalletError<Rv>;
+    PayError: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * The cycle is after that in which the payment was made.
      **/
-    NotCurrent: GenericPalletError<Rv>;
+    NotCurrent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CoreFellowship`'s errors
@@ -2944,54 +2944,54 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Member's rank is too low.
      **/
-    Unranked: GenericPalletError<Rv>;
+    Unranked: GenericPalletError;
 
     /**
      * Member's rank is not zero.
      **/
-    Ranked: GenericPalletError<Rv>;
+    Ranked: GenericPalletError;
 
     /**
      * Member's rank is not as expected - generally means that the rank provided to the call
      * does not agree with the state of the system.
      **/
-    UnexpectedRank: GenericPalletError<Rv>;
+    UnexpectedRank: GenericPalletError;
 
     /**
      * The given rank is invalid - this generally means it's not between 1 and `RANK_COUNT`.
      **/
-    InvalidRank: GenericPalletError<Rv>;
+    InvalidRank: GenericPalletError;
 
     /**
      * The origin does not have enough permission to do this operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * No work needs to be done at present for this member.
      **/
-    NothingDoing: GenericPalletError<Rv>;
+    NothingDoing: GenericPalletError;
 
     /**
      * The candidate has already been inducted. This should never happen since it would
      * require a candidate (rank 0) to already be tracked in the pallet.
      **/
-    AlreadyInducted: GenericPalletError<Rv>;
+    AlreadyInducted: GenericPalletError;
 
     /**
      * The candidate has not been inducted, so cannot be offboarded from this pallet.
      **/
-    NotTracked: GenericPalletError<Rv>;
+    NotTracked: GenericPalletError;
 
     /**
      * Operation cannot be done yet since not enough time has passed.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TransactionStorage`'s errors
@@ -3000,67 +3000,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid configuration.
      **/
-    NotConfigured: GenericPalletError<Rv>;
+    NotConfigured: GenericPalletError;
 
     /**
      * Renewed extrinsic is not found.
      **/
-    RenewedNotFound: GenericPalletError<Rv>;
+    RenewedNotFound: GenericPalletError;
 
     /**
      * Attempting to store empty transaction
      **/
-    EmptyTransaction: GenericPalletError<Rv>;
+    EmptyTransaction: GenericPalletError;
 
     /**
      * Proof was not expected in this block.
      **/
-    UnexpectedProof: GenericPalletError<Rv>;
+    UnexpectedProof: GenericPalletError;
 
     /**
      * Proof failed verification.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * Missing storage proof.
      **/
-    MissingProof: GenericPalletError<Rv>;
+    MissingProof: GenericPalletError;
 
     /**
      * Unable to verify proof because state data is missing.
      **/
-    MissingStateData: GenericPalletError<Rv>;
+    MissingStateData: GenericPalletError;
 
     /**
      * Double proof check in the block.
      **/
-    DoubleCheck: GenericPalletError<Rv>;
+    DoubleCheck: GenericPalletError;
 
     /**
      * Storage proof was not checked in the block.
      **/
-    ProofNotChecked: GenericPalletError<Rv>;
+    ProofNotChecked: GenericPalletError;
 
     /**
      * Transaction is too large.
      **/
-    TransactionTooLarge: GenericPalletError<Rv>;
+    TransactionTooLarge: GenericPalletError;
 
     /**
      * Too many transactions in the block.
      **/
-    TooManyTransactions: GenericPalletError<Rv>;
+    TooManyTransactions: GenericPalletError;
 
     /**
      * Attempted to call `store` outside of block execution.
      **/
-    BadContext: GenericPalletError<Rv>;
+    BadContext: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -3069,12 +3069,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -3083,7 +3083,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -3094,32 +3094,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -3128,22 +3128,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -3152,77 +3152,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Remark`'s errors
@@ -3231,17 +3231,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempting to store empty data.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Attempted to call `store` outside of block execution.
      **/
-    BadContext: GenericPalletError<Rv>;
+    BadContext: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -3250,68 +3250,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -3320,32 +3320,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AllianceMotion`'s errors
@@ -3354,67 +3354,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is not a member
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Duplicate proposals not allowed
      **/
-    DuplicateProposal: GenericPalletError<Rv>;
+    DuplicateProposal: GenericPalletError;
 
     /**
      * Proposal must exist
      **/
-    ProposalMissing: GenericPalletError<Rv>;
+    ProposalMissing: GenericPalletError;
 
     /**
      * Mismatched index
      **/
-    WrongIndex: GenericPalletError<Rv>;
+    WrongIndex: GenericPalletError;
 
     /**
      * Duplicate vote ignored
      **/
-    DuplicateVote: GenericPalletError<Rv>;
+    DuplicateVote: GenericPalletError;
 
     /**
      * Members are already initialized!
      **/
-    AlreadyInitialized: GenericPalletError<Rv>;
+    AlreadyInitialized: GenericPalletError;
 
     /**
      * The close call was made too early, before the end of the voting.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There can only be a maximum of `MaxProposals` active proposals.
      **/
-    TooManyProposals: GenericPalletError<Rv>;
+    TooManyProposals: GenericPalletError;
 
     /**
      * The given weight bound for the proposal was too low.
      **/
-    WrongProposalWeight: GenericPalletError<Rv>;
+    WrongProposalWeight: GenericPalletError;
 
     /**
      * The given length bound for the proposal was too low.
      **/
-    WrongProposalLength: GenericPalletError<Rv>;
+    WrongProposalLength: GenericPalletError;
 
     /**
      * Prime account is not a member
      **/
-    PrimeAccountNotMember: GenericPalletError<Rv>;
+    PrimeAccountNotMember: GenericPalletError;
 
     /**
      * Proposal is still active.
      **/
-    ProposalActive: GenericPalletError<Rv>;
+    ProposalActive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Alliance`'s errors
@@ -3423,128 +3423,128 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The Alliance has not been initialized yet, therefore accounts cannot join it.
      **/
-    AllianceNotYetInitialized: GenericPalletError<Rv>;
+    AllianceNotYetInitialized: GenericPalletError;
 
     /**
      * The Alliance has been initialized, therefore cannot be initialized again.
      **/
-    AllianceAlreadyInitialized: GenericPalletError<Rv>;
+    AllianceAlreadyInitialized: GenericPalletError;
 
     /**
      * Account is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Account is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * Account is not an ally.
      **/
-    NotAlly: GenericPalletError<Rv>;
+    NotAlly: GenericPalletError;
 
     /**
      * Account does not have voting rights.
      **/
-    NoVotingRights: GenericPalletError<Rv>;
+    NoVotingRights: GenericPalletError;
 
     /**
      * Account is already an elevated (fellow) member.
      **/
-    AlreadyElevated: GenericPalletError<Rv>;
+    AlreadyElevated: GenericPalletError;
 
     /**
      * Item is already listed as unscrupulous.
      **/
-    AlreadyUnscrupulous: GenericPalletError<Rv>;
+    AlreadyUnscrupulous: GenericPalletError;
 
     /**
      * Account has been deemed unscrupulous by the Alliance and is not welcome to join or be
      * nominated.
      **/
-    AccountNonGrata: GenericPalletError<Rv>;
+    AccountNonGrata: GenericPalletError;
 
     /**
      * Item has not been deemed unscrupulous.
      **/
-    NotListedAsUnscrupulous: GenericPalletError<Rv>;
+    NotListedAsUnscrupulous: GenericPalletError;
 
     /**
      * The number of unscrupulous items exceeds `MaxUnscrupulousItems`.
      **/
-    TooManyUnscrupulousItems: GenericPalletError<Rv>;
+    TooManyUnscrupulousItems: GenericPalletError;
 
     /**
      * Length of website URL exceeds `MaxWebsiteUrlLength`.
      **/
-    TooLongWebsiteUrl: GenericPalletError<Rv>;
+    TooLongWebsiteUrl: GenericPalletError;
 
     /**
      * Balance is insufficient for the required deposit.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account's identity does not have display field and website field.
      **/
-    WithoutRequiredIdentityFields: GenericPalletError<Rv>;
+    WithoutRequiredIdentityFields: GenericPalletError;
 
     /**
      * The account's identity has no good judgement.
      **/
-    WithoutGoodIdentityJudgement: GenericPalletError<Rv>;
+    WithoutGoodIdentityJudgement: GenericPalletError;
 
     /**
      * The proposal hash is not found.
      **/
-    MissingProposalHash: GenericPalletError<Rv>;
+    MissingProposalHash: GenericPalletError;
 
     /**
      * The announcement is not found.
      **/
-    MissingAnnouncement: GenericPalletError<Rv>;
+    MissingAnnouncement: GenericPalletError;
 
     /**
      * Number of members exceeds `MaxMembersCount`.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Number of announcements exceeds `MaxAnnouncementsCount`.
      **/
-    TooManyAnnouncements: GenericPalletError<Rv>;
+    TooManyAnnouncements: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Account already gave retirement notice
      **/
-    AlreadyRetiring: GenericPalletError<Rv>;
+    AlreadyRetiring: GenericPalletError;
 
     /**
      * Account did not give a retirement notice required to retire.
      **/
-    RetirementNoticeNotGiven: GenericPalletError<Rv>;
+    RetirementNoticeNotGiven: GenericPalletError;
 
     /**
      * Retirement period has not passed.
      **/
-    RetirementPeriodNotPassed: GenericPalletError<Rv>;
+    RetirementPeriodNotPassed: GenericPalletError;
 
     /**
      * Fellows must be provided to initialize the Alliance.
      **/
-    FellowsMissing: GenericPalletError<Rv>;
+    FellowsMissing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -3553,44 +3553,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -3599,160 +3599,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RankedPolls`'s errors
@@ -3761,77 +3761,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RankedCollective`'s errors
@@ -3840,62 +3840,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Account is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * The given poll index is unknown or has closed.
      **/
-    NotPolling: GenericPalletError<Rv>;
+    NotPolling: GenericPalletError;
 
     /**
      * The given poll is still ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * There are no further records to be removed.
      **/
-    NoneRemaining: GenericPalletError<Rv>;
+    NoneRemaining: GenericPalletError;
 
     /**
      * Unexpected error in state.
      **/
-    Corruption: GenericPalletError<Rv>;
+    Corruption: GenericPalletError;
 
     /**
      * The member's rank is too low to vote.
      **/
-    RankTooLow: GenericPalletError<Rv>;
+    RankTooLow: GenericPalletError;
 
     /**
      * The information provided is incorrect.
      **/
-    InvalidWitness: GenericPalletError<Rv>;
+    InvalidWitness: GenericPalletError;
 
     /**
      * The origin is not sufficiently privileged to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The new member to exchange is the same as the old member
      **/
-    SameMember: GenericPalletError<Rv>;
+    SameMember: GenericPalletError;
 
     /**
      * The max member count for the rank has been reached.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversion`'s errors
@@ -3904,125 +3904,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Pool already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Desired amount can't be zero.
      **/
-    WrongDesiredAmount: GenericPalletError<Rv>;
+    WrongDesiredAmount: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountOneLessThanMinimal: GenericPalletError<Rv>;
+    AmountOneLessThanMinimal: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountTwoLessThanMinimal: GenericPalletError<Rv>;
+    AmountTwoLessThanMinimal: GenericPalletError;
 
     /**
      * Reserve needs to always be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    ReserveLeftLessThanMinimal: GenericPalletError<Rv>;
+    ReserveLeftLessThanMinimal: GenericPalletError;
 
     /**
      * Desired amount can't be equal to the pool reserve.
      **/
-    AmountOutTooHigh: GenericPalletError<Rv>;
+    AmountOutTooHigh: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An overflow happened.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * Optimal calculated amount is less than desired.
      **/
-    OptimalAmountLessThanDesired: GenericPalletError<Rv>;
+    OptimalAmountLessThanDesired: GenericPalletError;
 
     /**
      * Insufficient liquidity minted.
      **/
-    InsufficientLiquidityMinted: GenericPalletError<Rv>;
+    InsufficientLiquidityMinted: GenericPalletError;
 
     /**
      * Requested liquidity can't be zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * Amount can't be zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Calculated amount out is less than provided minimum amount.
      **/
-    ProvidedMinimumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMinimumNotSufficientForSwap: GenericPalletError;
 
     /**
      * Provided maximum amount is not sufficient for swap.
      **/
-    ProvidedMaximumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMaximumNotSufficientForSwap: GenericPalletError;
 
     /**
      * The provided path must consists of 2 assets at least.
      **/
-    InvalidPath: GenericPalletError<Rv>;
+    InvalidPath: GenericPalletError;
 
     /**
      * The provided path must consists of unique assets.
      **/
-    NonUniquePath: GenericPalletError<Rv>;
+    NonUniquePath: GenericPalletError;
 
     /**
      * It was not possible to get or increment the Id of the pool.
      **/
-    IncorrectPoolAssetId: GenericPalletError<Rv>;
+    IncorrectPoolAssetId: GenericPalletError;
 
     /**
      * The destination account cannot exist with the swapped funds.
      **/
-    BelowMinimum: GenericPalletError<Rv>;
+    BelowMinimum: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -4033,37 +4033,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -4073,32 +4073,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -4106,24 +4106,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TxPause`'s errors
@@ -4132,23 +4132,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The call is paused.
      **/
-    IsPaused: GenericPalletError<Rv>;
+    IsPaused: GenericPalletError;
 
     /**
      * The call is unpaused.
      **/
-    IsUnpaused: GenericPalletError<Rv>;
+    IsUnpaused: GenericPalletError;
 
     /**
      * The call is whitelisted and cannot be paused.
      **/
-    Unpausable: GenericPalletError<Rv>;
-    NotFound: GenericPalletError<Rv>;
+    Unpausable: GenericPalletError;
+    NotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SafeMode`'s errors
@@ -4157,42 +4157,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The safe-mode is (already or still) entered.
      **/
-    Entered: GenericPalletError<Rv>;
+    Entered: GenericPalletError;
 
     /**
      * The safe-mode is (already or still) exited.
      **/
-    Exited: GenericPalletError<Rv>;
+    Exited: GenericPalletError;
 
     /**
      * This functionality of the pallet is disabled by the configuration.
      **/
-    NotConfigured: GenericPalletError<Rv>;
+    NotConfigured: GenericPalletError;
 
     /**
      * There is no balance reserved.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The account already has a deposit reserved and can therefore not enter or extend again.
      **/
-    AlreadyDeposited: GenericPalletError<Rv>;
+    AlreadyDeposited: GenericPalletError;
 
     /**
      * This deposit cannot be released yet.
      **/
-    CannotReleaseYet: GenericPalletError<Rv>;
+    CannotReleaseYet: GenericPalletError;
 
     /**
      * An error from the underlying `Currency`.
      **/
-    CurrencyError: GenericPalletError<Rv>;
+    CurrencyError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -4201,12 +4201,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Broker`'s errors
@@ -4215,196 +4215,196 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given region identity is not known.
      **/
-    UnknownRegion: GenericPalletError<Rv>;
+    UnknownRegion: GenericPalletError;
 
     /**
      * The owner of the region is not the origin.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The pivot point of the partition at or after the end of the region.
      **/
-    PivotTooLate: GenericPalletError<Rv>;
+    PivotTooLate: GenericPalletError;
 
     /**
      * The pivot point of the partition at the beginning of the region.
      **/
-    PivotTooEarly: GenericPalletError<Rv>;
+    PivotTooEarly: GenericPalletError;
 
     /**
      * The pivot mask for the interlacing is not contained within the region's interlace mask.
      **/
-    ExteriorPivot: GenericPalletError<Rv>;
+    ExteriorPivot: GenericPalletError;
 
     /**
      * The pivot mask for the interlacing is void (and therefore unschedulable).
      **/
-    VoidPivot: GenericPalletError<Rv>;
+    VoidPivot: GenericPalletError;
 
     /**
      * The pivot mask for the interlacing is complete (and therefore not a strict subset).
      **/
-    CompletePivot: GenericPalletError<Rv>;
+    CompletePivot: GenericPalletError;
 
     /**
      * The workplan of the pallet's state is invalid. This indicates a state corruption.
      **/
-    CorruptWorkplan: GenericPalletError<Rv>;
+    CorruptWorkplan: GenericPalletError;
 
     /**
      * There is no sale happening currently.
      **/
-    NoSales: GenericPalletError<Rv>;
+    NoSales: GenericPalletError;
 
     /**
      * The price limit is exceeded.
      **/
-    Overpriced: GenericPalletError<Rv>;
+    Overpriced: GenericPalletError;
 
     /**
      * There are no cores available.
      **/
-    Unavailable: GenericPalletError<Rv>;
+    Unavailable: GenericPalletError;
 
     /**
      * The sale limit has been reached.
      **/
-    SoldOut: GenericPalletError<Rv>;
+    SoldOut: GenericPalletError;
 
     /**
      * The renewal operation is not valid at the current time (it may become valid in the next
      * sale).
      **/
-    WrongTime: GenericPalletError<Rv>;
+    WrongTime: GenericPalletError;
 
     /**
      * Invalid attempt to renew.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * This pallet has not yet been initialized.
      **/
-    Uninitialized: GenericPalletError<Rv>;
+    Uninitialized: GenericPalletError;
 
     /**
      * The purchase cannot happen yet as the sale period is yet to begin.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * There is no work to be done.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * The maximum amount of reservations has already been reached.
      **/
-    TooManyReservations: GenericPalletError<Rv>;
+    TooManyReservations: GenericPalletError;
 
     /**
      * The maximum amount of leases has already been reached.
      **/
-    TooManyLeases: GenericPalletError<Rv>;
+    TooManyLeases: GenericPalletError;
 
     /**
      * The lease does not exist.
      **/
-    LeaseNotFound: GenericPalletError<Rv>;
+    LeaseNotFound: GenericPalletError;
 
     /**
      * The revenue for the Instantaneous Core Sales of this period is not (yet) known and thus
      * this operation cannot proceed.
      **/
-    UnknownRevenue: GenericPalletError<Rv>;
+    UnknownRevenue: GenericPalletError;
 
     /**
      * The identified contribution to the Instantaneous Core Pool is unknown.
      **/
-    UnknownContribution: GenericPalletError<Rv>;
+    UnknownContribution: GenericPalletError;
 
     /**
      * The workload assigned for renewal is incomplete. This is unexpected and indicates a
      * logic error.
      **/
-    IncompleteAssignment: GenericPalletError<Rv>;
+    IncompleteAssignment: GenericPalletError;
 
     /**
      * An item cannot be dropped because it is still valid.
      **/
-    StillValid: GenericPalletError<Rv>;
+    StillValid: GenericPalletError;
 
     /**
      * The history item does not exist.
      **/
-    NoHistory: GenericPalletError<Rv>;
+    NoHistory: GenericPalletError;
 
     /**
      * No reservation of the given index exists.
      **/
-    UnknownReservation: GenericPalletError<Rv>;
+    UnknownReservation: GenericPalletError;
 
     /**
      * The renewal record cannot be found.
      **/
-    UnknownRenewal: GenericPalletError<Rv>;
+    UnknownRenewal: GenericPalletError;
 
     /**
      * The lease expiry time has already passed.
      **/
-    AlreadyExpired: GenericPalletError<Rv>;
+    AlreadyExpired: GenericPalletError;
 
     /**
      * The configuration could not be applied because it is invalid.
      **/
-    InvalidConfig: GenericPalletError<Rv>;
+    InvalidConfig: GenericPalletError;
 
     /**
      * The revenue must be claimed for 1 or more timeslices.
      **/
-    NoClaimTimeslices: GenericPalletError<Rv>;
+    NoClaimTimeslices: GenericPalletError;
 
     /**
      * The caller doesn't have the permission to enable or disable auto-renewal.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * We reached the limit for auto-renewals.
      **/
-    TooManyAutoRenewals: GenericPalletError<Rv>;
+    TooManyAutoRenewals: GenericPalletError;
 
     /**
      * Only cores which are assigned to a task can be auto-renewed.
      **/
-    NonTaskAutoRenewal: GenericPalletError<Rv>;
+    NonTaskAutoRenewal: GenericPalletError;
 
     /**
      * Failed to get the sovereign account of a task.
      **/
-    SovereignAccountNotFound: GenericPalletError<Rv>;
+    SovereignAccountNotFound: GenericPalletError;
 
     /**
      * Attempted to disable auto-renewal for a core that didn't have it enabled.
      **/
-    AutoRenewalNotEnabled: GenericPalletError<Rv>;
+    AutoRenewalNotEnabled: GenericPalletError;
 
     /**
      * Attempted to force remove an assignment that doesn't exist.
      **/
-    AssignmentNotFound: GenericPalletError<Rv>;
+    AssignmentNotFound: GenericPalletError;
 
     /**
      * Needed to prevent spam attacks.The amount of credits the user attempted to purchase is
      * below `T::MinimumCreditPurchase`.
      **/
-    CreditPurchaseTooSmall: GenericPalletError<Rv>;
+    CreditPurchaseTooSmall: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `TasksExample`'s errors
@@ -4413,12 +4413,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The referenced task was not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversionMigration`'s errors
@@ -4427,27 +4427,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * Pool's balance cannot be zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Indicates a partial transfer of balance to the new account during a migration.
      **/
-    PartialTransfer: GenericPalletError<Rv>;
+    PartialTransfer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Revive`'s errors
@@ -4456,134 +4456,134 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * The size defined in `T::MaxValueSize` was exceeded.
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * The chain does not provide a chain extension. Calling the chain extension results
      * in this error. Note that this usually shouldn't happen as deploying such contracts
      * is rejected.
      **/
-    NoChainExtension: GenericPalletError<Rv>;
+    NoChainExtension: GenericPalletError;
 
     /**
      * Failed to decode the XCM program.
      **/
-    XcmDecodeFailed: GenericPalletError<Rv>;
+    XcmDecodeFailed: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract called into the runtime which then called back into this pallet.
      **/
-    ReenteredPallet: GenericPalletError<Rv>;
+    ReenteredPallet: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -4591,7 +4591,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract failed to compile or is missing the correct entry points.
@@ -4599,121 +4599,121 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::revive=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * The code blob supplied is larger than [`limits::code::BLOB_BYTES`].
      **/
-    BlobTooLarge: GenericPalletError<Rv>;
+    BlobTooLarge: GenericPalletError;
 
     /**
      * The static memory consumption of the blob will be larger than
      * [`limits::code::STATIC_MEMORY_BYTES`].
      **/
-    StaticMemoryTooLarge: GenericPalletError<Rv>;
+    StaticMemoryTooLarge: GenericPalletError;
 
     /**
      * The program contains a basic block that is larger than allowed.
      **/
-    BasicBlockTooLarge: GenericPalletError<Rv>;
+    BasicBlockTooLarge: GenericPalletError;
 
     /**
      * The program contains an invalid instruction.
      **/
-    InvalidInstruction: GenericPalletError<Rv>;
+    InvalidInstruction: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * The contract tried to call a syscall which does not exist (at its current api level).
      **/
-    InvalidSyscall: GenericPalletError<Rv>;
+    InvalidSyscall: GenericPalletError;
 
     /**
      * Invalid storage flags were passed to one of the storage syscalls.
      **/
-    InvalidStorageFlags: GenericPalletError<Rv>;
+    InvalidStorageFlags: GenericPalletError;
 
     /**
      * PolkaVM failed during code execution. Probably due to a malformed program.
      **/
-    ExecutionFailed: GenericPalletError<Rv>;
+    ExecutionFailed: GenericPalletError;
 
     /**
      * Failed to convert a U256 to a Balance.
      **/
-    BalanceConversionFailed: GenericPalletError<Rv>;
+    BalanceConversionFailed: GenericPalletError;
 
     /**
      * Failed to convert an EVM balance to a native balance.
      **/
-    DecimalPrecisionLoss: GenericPalletError<Rv>;
+    DecimalPrecisionLoss: GenericPalletError;
 
     /**
      * Immutable data can only be set during deploys and only be read during calls.
      * Additionally, it is only valid to set the data once and it must not be empty.
      **/
-    InvalidImmutableAccess: GenericPalletError<Rv>;
+    InvalidImmutableAccess: GenericPalletError;
 
     /**
      * An `AccountID32` account tried to interact with the pallet without having a mapping.
      *
      * Call [`Pallet::map_account`] in order to create a mapping for the account.
      **/
-    AccountUnmapped: GenericPalletError<Rv>;
+    AccountUnmapped: GenericPalletError;
 
     /**
      * Tried to map an account that is already mapped.
      **/
-    AccountAlreadyMapped: GenericPalletError<Rv>;
+    AccountAlreadyMapped: GenericPalletError;
 
     /**
      * The transaction used to dry-run a contract is invalid.
      **/
-    InvalidGenericTransaction: GenericPalletError<Rv>;
+    InvalidGenericTransaction: GenericPalletError;
 
     /**
      * The refcount of a code either over or underflowed.
      **/
-    RefcountOverOrUnderflow: GenericPalletError<Rv>;
+    RefcountOverOrUnderflow: GenericPalletError;
 
     /**
      * Unsupported precompile address
      **/
-    UnsupportedPrecompileAddress: GenericPalletError<Rv>;
+    UnsupportedPrecompileAddress: GenericPalletError;
 
     /**
      * Precompile Error
      **/
-    PrecompileFailure: GenericPalletError<Rv>;
+    PrecompileFailure: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -4722,17 +4722,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -4741,52 +4741,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRewards`'s errors
@@ -4795,57 +4795,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The staker does not have enough tokens to perform the operation.
      **/
-    NotEnoughTokens: GenericPalletError<Rv>;
+    NotEnoughTokens: GenericPalletError;
 
     /**
      * An operation was attempted on a non-existent pool.
      **/
-    NonExistentPool: GenericPalletError<Rv>;
+    NonExistentPool: GenericPalletError;
 
     /**
      * An operation was attempted for a non-existent staker.
      **/
-    NonExistentStaker: GenericPalletError<Rv>;
+    NonExistentStaker: GenericPalletError;
 
     /**
      * An operation was attempted with a non-existent asset.
      **/
-    NonExistentAsset: GenericPalletError<Rv>;
+    NonExistentAsset: GenericPalletError;
 
     /**
      * There was an error converting a block number.
      **/
-    BlockNumberConversionError: GenericPalletError<Rv>;
+    BlockNumberConversionError: GenericPalletError;
 
     /**
      * The expiry block must be in the future.
      **/
-    ExpiryBlockMustBeInTheFuture: GenericPalletError<Rv>;
+    ExpiryBlockMustBeInTheFuture: GenericPalletError;
 
     /**
      * Insufficient funds to create the freeze.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The expiry block can be only extended.
      **/
-    ExpiryCut: GenericPalletError<Rv>;
+    ExpiryCut: GenericPalletError;
 
     /**
      * The reward rate per block can be only increased.
      **/
-    RewardRateCut: GenericPalletError<Rv>;
+    RewardRateCut: GenericPalletError;
 
     /**
      * The pool still has staked tokens or rewards.
      **/
-    NonEmptyPool: GenericPalletError<Rv>;
+    NonEmptyPool: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetsFreezer`'s errors
@@ -4854,12 +4854,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Number of freezes on an account would exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MetaTx`'s errors
@@ -4868,36 +4868,36 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid proof (e.g. signature).
      **/
-    BadProof: GenericPalletError<Rv>;
+    BadProof: GenericPalletError;
 
     /**
      * The meta transaction is not yet valid (e.g. nonce too high).
      **/
-    Future: GenericPalletError<Rv>;
+    Future: GenericPalletError;
 
     /**
      * The meta transaction is outdated (e.g. nonce too low).
      **/
-    Stale: GenericPalletError<Rv>;
+    Stale: GenericPalletError;
 
     /**
      * The meta transactions's birth block is ancient.
      **/
-    AncientBirthBlock: GenericPalletError<Rv>;
+    AncientBirthBlock: GenericPalletError;
 
     /**
      * The transaction extension did not authorize any origin.
      **/
-    UnknownOrigin: GenericPalletError<Rv>;
+    UnknownOrigin: GenericPalletError;
 
     /**
      * The meta transaction is invalid.
      **/
-    Invalid: GenericPalletError<Rv>;
+    Invalid: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/substrate/events.d.ts b/packages/chaintypes/src/substrate/events.d.ts
index 94c80857..e7d109f9 100644
--- a/packages/chaintypes/src/substrate/events.d.ts
+++ b/packages/chaintypes/src/substrate/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -67,7 +67,7 @@ import type {
   KitchensinkRuntimeOriginCaller,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -75,18 +75,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -95,33 +89,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -130,7 +123,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -140,47 +133,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -189,23 +182,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -214,7 +206,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -223,40 +215,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -265,82 +256,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -351,7 +342,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -360,7 +350,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversionTxPayment`'s events
@@ -371,7 +361,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who` in an asset `asset_id`.
      **/
     AssetTxFeePaid: GenericPalletEvent<
-      Rv,
       'AssetConversionTxPayment',
       'AssetTxFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint; assetId: FrameSupportTokensFungibleUnionOfNativeOrWithId }
@@ -381,7 +370,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A swap of the refund in native currency back to asset failed.
      **/
     AssetRefundFailed: GenericPalletEvent<
-      Rv,
       'AssetConversionTxPayment',
       'AssetRefundFailed',
       { nativeAmountKept: bigint }
@@ -390,7 +378,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -406,7 +394,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -420,7 +407,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -431,23 +417,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -456,7 +441,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -466,18 +451,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -486,14 +465,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -503,17 +481,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -521,39 +494,38 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -563,7 +535,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -572,38 +543,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -613,22 +579,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Democracy`'s events
@@ -637,68 +603,62 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion has been proposed by a public account.
      **/
-    Proposed: GenericPalletEvent<Rv, 'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
+    Proposed: GenericPalletEvent<'Democracy', 'Proposed', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * A public proposal has been tabled for referendum vote.
      **/
-    Tabled: GenericPalletEvent<Rv, 'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
+    Tabled: GenericPalletEvent<'Democracy', 'Tabled', { proposalIndex: number; deposit: bigint }>;
 
     /**
      * An external proposal has been tabled.
      **/
-    ExternalTabled: GenericPalletEvent<Rv, 'Democracy', 'ExternalTabled', null>;
+    ExternalTabled: GenericPalletEvent<'Democracy', 'ExternalTabled', null>;
 
     /**
      * A referendum has begun.
      **/
-    Started: GenericPalletEvent<
-      Rv,
-      'Democracy',
-      'Started',
-      { refIndex: number; threshold: PalletDemocracyVoteThreshold }
-    >;
+    Started: GenericPalletEvent<'Democracy', 'Started', { refIndex: number; threshold: PalletDemocracyVoteThreshold }>;
 
     /**
      * A proposal has been approved by referendum.
      **/
-    Passed: GenericPalletEvent<Rv, 'Democracy', 'Passed', { refIndex: number }>;
+    Passed: GenericPalletEvent<'Democracy', 'Passed', { refIndex: number }>;
 
     /**
      * A proposal has been rejected by referendum.
      **/
-    NotPassed: GenericPalletEvent<Rv, 'Democracy', 'NotPassed', { refIndex: number }>;
+    NotPassed: GenericPalletEvent<'Democracy', 'NotPassed', { refIndex: number }>;
 
     /**
      * A referendum has been cancelled.
      **/
-    Cancelled: GenericPalletEvent<Rv, 'Democracy', 'Cancelled', { refIndex: number }>;
+    Cancelled: GenericPalletEvent<'Democracy', 'Cancelled', { refIndex: number }>;
 
     /**
      * An account has delegated their vote to another account.
      **/
-    Delegated: GenericPalletEvent<Rv, 'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
+    Delegated: GenericPalletEvent<'Democracy', 'Delegated', { who: AccountId32; target: AccountId32 }>;
 
     /**
      * An account has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'Democracy', 'Undelegated', { account: AccountId32 }>;
+    Undelegated: GenericPalletEvent<'Democracy', 'Undelegated', { account: AccountId32 }>;
 
     /**
      * An external proposal has been vetoed.
      **/
-    Vetoed: GenericPalletEvent<Rv, 'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
+    Vetoed: GenericPalletEvent<'Democracy', 'Vetoed', { who: AccountId32; proposalHash: H256; until: number }>;
 
     /**
      * A proposal_hash has been blacklisted permanently.
      **/
-    Blacklisted: GenericPalletEvent<Rv, 'Democracy', 'Blacklisted', { proposalHash: H256 }>;
+    Blacklisted: GenericPalletEvent<'Democracy', 'Blacklisted', { proposalHash: H256 }>;
 
     /**
      * An account has voted in a referendum
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Democracy',
       'Voted',
       { voter: AccountId32; refIndex: number; vote: PalletDemocracyVoteAccountVote }
@@ -707,18 +667,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has seconded a proposal
      **/
-    Seconded: GenericPalletEvent<Rv, 'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
+    Seconded: GenericPalletEvent<'Democracy', 'Seconded', { seconder: AccountId32; propIndex: number }>;
 
     /**
      * A proposal got canceled.
      **/
-    ProposalCanceled: GenericPalletEvent<Rv, 'Democracy', 'ProposalCanceled', { propIndex: number }>;
+    ProposalCanceled: GenericPalletEvent<'Democracy', 'ProposalCanceled', { propIndex: number }>;
 
     /**
      * Metadata for a proposal or a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataSet',
       {
@@ -738,7 +697,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a proposal or a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataCleared',
       {
@@ -758,7 +716,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata has been transferred to new owner.
      **/
     MetadataTransferred: GenericPalletEvent<
-      Rv,
       'Democracy',
       'MetadataTransferred',
       {
@@ -782,7 +739,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Council`'s events
@@ -793,7 +750,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'Council',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -804,7 +760,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'Council',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -813,23 +768,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'Council', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'Council', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'Council', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'Council', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
-    Executed: GenericPalletEvent<Rv, 'Council', 'Executed', { proposalHash: H256; result: Result<[], DispatchError> }>;
+    Executed: GenericPalletEvent<'Council', 'Executed', { proposalHash: H256; result: Result<[], DispatchError> }>;
 
     /**
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'Council',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -838,28 +792,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'Council', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'Council', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'Council', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'Council', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
-    ProposalCostBurned: GenericPalletEvent<
-      Rv,
-      'Council',
-      'ProposalCostBurned',
-      { proposalHash: H256; who: AccountId32 }
-    >;
+    ProposalCostBurned: GenericPalletEvent<'Council', 'ProposalCostBurned', { proposalHash: H256; who: AccountId32 }>;
 
     /**
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'Council',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -868,7 +816,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalCommittee`'s events
@@ -879,7 +827,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -890,7 +837,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -899,18 +845,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'TechnicalCommittee', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'TechnicalCommittee', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -920,7 +865,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -929,18 +873,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'TechnicalCommittee', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'TechnicalCommittee', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'TechnicalCommittee', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId32 }
@@ -950,7 +893,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'TechnicalCommittee',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -959,7 +901,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Elections`'s events
@@ -972,29 +914,29 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * slashed and none were elected, whilst `EmptyTerm` means that no candidates existed to
      * begin with.
      **/
-    NewTerm: GenericPalletEvent<Rv, 'Elections', 'NewTerm', { newMembers: Array<[AccountId32, bigint]> }>;
+    NewTerm: GenericPalletEvent<'Elections', 'NewTerm', { newMembers: Array<[AccountId32, bigint]> }>;
 
     /**
      * No (or not enough) candidates existed for this round. This is different from
      * `NewTerm(\[\])`. See the description of `NewTerm`.
      **/
-    EmptyTerm: GenericPalletEvent<Rv, 'Elections', 'EmptyTerm', null>;
+    EmptyTerm: GenericPalletEvent<'Elections', 'EmptyTerm', null>;
 
     /**
      * Internal error happened while trying to perform election.
      **/
-    ElectionError: GenericPalletEvent<Rv, 'Elections', 'ElectionError', null>;
+    ElectionError: GenericPalletEvent<'Elections', 'ElectionError', null>;
 
     /**
      * A member has been removed. This should always be followed by either `NewTerm` or
      * `EmptyTerm`.
      **/
-    MemberKicked: GenericPalletEvent<Rv, 'Elections', 'MemberKicked', { member: AccountId32 }>;
+    MemberKicked: GenericPalletEvent<'Elections', 'MemberKicked', { member: AccountId32 }>;
 
     /**
      * Someone has renounced their candidacy.
      **/
-    Renounced: GenericPalletEvent<Rv, 'Elections', 'Renounced', { candidate: AccountId32 }>;
+    Renounced: GenericPalletEvent<'Elections', 'Renounced', { candidate: AccountId32 }>;
 
     /**
      * A candidate was slashed by amount due to failing to obtain a seat as member or
@@ -1002,18 +944,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Note that old members and runners-up are also candidates.
      **/
-    CandidateSlashed: GenericPalletEvent<
-      Rv,
-      'Elections',
-      'CandidateSlashed',
-      { candidate: AccountId32; amount: bigint }
-    >;
+    CandidateSlashed: GenericPalletEvent<'Elections', 'CandidateSlashed', { candidate: AccountId32; amount: bigint }>;
 
     /**
      * A seat holder was slashed by amount by being forcefully removed from the set.
      **/
     SeatHolderSlashed: GenericPalletEvent<
-      Rv,
       'Elections',
       'SeatHolderSlashed',
       { seatHolder: AccountId32; amount: bigint }
@@ -1022,7 +958,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TechnicalMembership`'s events
@@ -1031,37 +967,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The given member was added; see the transaction for who.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'TechnicalMembership', 'MemberAdded', undefined>;
+    MemberAdded: GenericPalletEvent<'TechnicalMembership', 'MemberAdded', undefined>;
 
     /**
      * The given member was removed; see the transaction for who.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'TechnicalMembership', 'MemberRemoved', undefined>;
+    MemberRemoved: GenericPalletEvent<'TechnicalMembership', 'MemberRemoved', undefined>;
 
     /**
      * Two members were swapped; see the transaction for who.
      **/
-    MembersSwapped: GenericPalletEvent<Rv, 'TechnicalMembership', 'MembersSwapped', undefined>;
+    MembersSwapped: GenericPalletEvent<'TechnicalMembership', 'MembersSwapped', undefined>;
 
     /**
      * The membership was reset; see the transaction for who the new set is.
      **/
-    MembersReset: GenericPalletEvent<Rv, 'TechnicalMembership', 'MembersReset', undefined>;
+    MembersReset: GenericPalletEvent<'TechnicalMembership', 'MembersReset', undefined>;
 
     /**
      * One of the members' keys changed.
      **/
-    KeyChanged: GenericPalletEvent<Rv, 'TechnicalMembership', 'KeyChanged', undefined>;
+    KeyChanged: GenericPalletEvent<'TechnicalMembership', 'KeyChanged', undefined>;
 
     /**
      * Phantom member, never used.
      **/
-    Dummy: GenericPalletEvent<Rv, 'TechnicalMembership', 'Dummy', undefined>;
+    Dummy: GenericPalletEvent<'TechnicalMembership', 'Dummy', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -1071,7 +1007,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -1080,17 +1015,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -1099,38 +1034,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -1139,18 +1068,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -1166,47 +1089,44 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId; old: FixedU128; new: FixedU128 }
@@ -1215,7 +1135,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Contracts`'s events
@@ -1224,7 +1144,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by address at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
+    Instantiated: GenericPalletEvent<'Contracts', 'Instantiated', { deployer: AccountId32; contract: AccountId32 }>;
 
     /**
      * Contract has been removed.
@@ -1235,7 +1155,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `seal_terminate`.
      **/
     Terminated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Terminated',
       {
@@ -1255,7 +1174,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Code with the specified hash has been stored.
      **/
     CodeStored: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeStored',
       { codeHash: H256; depositHeld: bigint; uploader: AccountId32 }
@@ -1265,7 +1183,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractEmitted',
       {
@@ -1286,7 +1203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A code with the specified hash was removed.
      **/
     CodeRemoved: GenericPalletEvent<
-      Rv,
       'Contracts',
       'CodeRemoved',
       { codeHash: H256; depositReleased: bigint; remover: AccountId32 }
@@ -1296,7 +1212,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A contract's code was updated.
      **/
     ContractCodeUpdated: GenericPalletEvent<
-      Rv,
       'Contracts',
       'ContractCodeUpdated',
       {
@@ -1327,7 +1242,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     Called: GenericPalletEvent<
-      Rv,
       'Contracts',
       'Called',
       {
@@ -1353,7 +1267,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * rolled back.
      **/
     DelegateCalled: GenericPalletEvent<
-      Rv,
       'Contracts',
       'DelegateCalled',
       {
@@ -1374,7 +1287,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some funds have been transferred and held as storage deposit.
      **/
     StorageDepositTransferredAndHeld: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndHeld',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -1384,7 +1296,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some storage deposit funds have been transferred and released.
      **/
     StorageDepositTransferredAndReleased: GenericPalletEvent<
-      Rv,
       'Contracts',
       'StorageDepositTransferredAndReleased',
       { from: AccountId32; to: AccountId32; amount: bigint }
@@ -1393,7 +1304,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -1403,7 +1314,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -1418,7 +1328,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -1437,13 +1346,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -1457,7 +1365,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ImOnline`'s events
@@ -1467,7 +1375,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new heartbeat was received from `AuthorityId`.
      **/
     HeartbeatReceived: GenericPalletEvent<
-      Rv,
       'ImOnline',
       'HeartbeatReceived',
       { authorityId: PalletImOnlineSr25519AppSr25519Public }
@@ -1476,17 +1383,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * At the end of the session, no offence was committed.
      **/
-    AllGood: GenericPalletEvent<Rv, 'ImOnline', 'AllGood', null>;
+    AllGood: GenericPalletEvent<'ImOnline', 'AllGood', null>;
 
     /**
      * At the end of the session, at least one validator was found to be offline.
      **/
-    SomeOffline: GenericPalletEvent<Rv, 'ImOnline', 'SomeOffline', { offline: Array<[AccountId32, []]> }>;
+    SomeOffline: GenericPalletEvent<'ImOnline', 'SomeOffline', { offline: Array<[AccountId32, []]> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -1497,12 +1404,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1511,23 +1418,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1537,7 +1443,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1546,23 +1451,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1572,7 +1471,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -1581,18 +1479,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1603,7 +1495,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1612,23 +1503,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1637,19 +1527,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1658,22 +1547,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Society`'s events
@@ -1682,51 +1571,45 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The society is founded by the given identity.
      **/
-    Founded: GenericPalletEvent<Rv, 'Society', 'Founded', { founder: AccountId32 }>;
+    Founded: GenericPalletEvent<'Society', 'Founded', { founder: AccountId32 }>;
 
     /**
      * A membership bid just happened. The given account is the candidate's ID and their offer
      * is the second.
      **/
-    Bid: GenericPalletEvent<Rv, 'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
+    Bid: GenericPalletEvent<'Society', 'Bid', { candidateId: AccountId32; offer: bigint }>;
 
     /**
      * A membership bid just happened by vouching. The given account is the candidate's ID and
      * their offer is the second. The vouching party is the third.
      **/
-    Vouch: GenericPalletEvent<
-      Rv,
-      'Society',
-      'Vouch',
-      { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }
-    >;
+    Vouch: GenericPalletEvent<'Society', 'Vouch', { candidateId: AccountId32; offer: bigint; vouching: AccountId32 }>;
 
     /**
      * A candidate was dropped (due to an excess of bids in the system).
      **/
-    AutoUnbid: GenericPalletEvent<Rv, 'Society', 'AutoUnbid', { candidate: AccountId32 }>;
+    AutoUnbid: GenericPalletEvent<'Society', 'AutoUnbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by their request).
      **/
-    Unbid: GenericPalletEvent<Rv, 'Society', 'Unbid', { candidate: AccountId32 }>;
+    Unbid: GenericPalletEvent<'Society', 'Unbid', { candidate: AccountId32 }>;
 
     /**
      * A candidate was dropped (by request of who vouched for them).
      **/
-    Unvouch: GenericPalletEvent<Rv, 'Society', 'Unvouch', { candidate: AccountId32 }>;
+    Unvouch: GenericPalletEvent<'Society', 'Unvouch', { candidate: AccountId32 }>;
 
     /**
      * A group of candidates have been inducted. The batch's primary is the first value, the
      * batch in full is the second.
      **/
-    Inducted: GenericPalletEvent<Rv, 'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
+    Inducted: GenericPalletEvent<'Society', 'Inducted', { primary: AccountId32; candidates: Array<AccountId32> }>;
 
     /**
      * A suspended member has been judged.
      **/
     SuspendedMemberJudgement: GenericPalletEvent<
-      Rv,
       'Society',
       'SuspendedMemberJudgement',
       { who: AccountId32; judged: boolean }
@@ -1735,52 +1618,52 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate has been suspended
      **/
-    CandidateSuspended: GenericPalletEvent<Rv, 'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
+    CandidateSuspended: GenericPalletEvent<'Society', 'CandidateSuspended', { candidate: AccountId32 }>;
 
     /**
      * A member has been suspended
      **/
-    MemberSuspended: GenericPalletEvent<Rv, 'Society', 'MemberSuspended', { member: AccountId32 }>;
+    MemberSuspended: GenericPalletEvent<'Society', 'MemberSuspended', { member: AccountId32 }>;
 
     /**
      * A member has been challenged
      **/
-    Challenged: GenericPalletEvent<Rv, 'Society', 'Challenged', { member: AccountId32 }>;
+    Challenged: GenericPalletEvent<'Society', 'Challenged', { member: AccountId32 }>;
 
     /**
      * A vote has been placed
      **/
-    Vote: GenericPalletEvent<Rv, 'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
+    Vote: GenericPalletEvent<'Society', 'Vote', { candidate: AccountId32; voter: AccountId32; vote: boolean }>;
 
     /**
      * A vote has been placed for a defending member
      **/
-    DefenderVote: GenericPalletEvent<Rv, 'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
+    DefenderVote: GenericPalletEvent<'Society', 'DefenderVote', { voter: AccountId32; vote: boolean }>;
 
     /**
      * A new set of \[params\] has been set for the group.
      **/
-    NewParams: GenericPalletEvent<Rv, 'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
+    NewParams: GenericPalletEvent<'Society', 'NewParams', { params: PalletSocietyGroupParams }>;
 
     /**
      * Society is unfounded.
      **/
-    Unfounded: GenericPalletEvent<Rv, 'Society', 'Unfounded', { founder: AccountId32 }>;
+    Unfounded: GenericPalletEvent<'Society', 'Unfounded', { founder: AccountId32 }>;
 
     /**
      * Some funds were deposited into the society account.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Society', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Society', 'Deposit', { value: bigint }>;
 
     /**
      * A \[member\] got elevated to \[rank\].
      **/
-    Elevated: GenericPalletEvent<Rv, 'Society', 'Elevated', { member: AccountId32; rank: number }>;
+    Elevated: GenericPalletEvent<'Society', 'Elevated', { member: AccountId32; rank: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Recovery`'s events
@@ -1789,13 +1672,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been set up for an account.
      **/
-    RecoveryCreated: GenericPalletEvent<Rv, 'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
+    RecoveryCreated: GenericPalletEvent<'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
 
     /**
      * A recovery process has been initiated for lost account by rescuer account.
      **/
     RecoveryInitiated: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryInitiated',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1805,7 +1687,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been vouched for by sender.
      **/
     RecoveryVouched: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryVouched',
       { lostAccount: AccountId32; rescuerAccount: AccountId32; sender: AccountId32 }
@@ -1815,7 +1696,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been closed.
      **/
     RecoveryClosed: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryClosed',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1825,7 +1705,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Lost account has been successfully recovered by rescuer account.
      **/
     AccountRecovered: GenericPalletEvent<
-      Rv,
       'Recovery',
       'AccountRecovered',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -1834,12 +1713,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been removed for an account.
      **/
-    RecoveryRemoved: GenericPalletEvent<Rv, 'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
+    RecoveryRemoved: GenericPalletEvent<'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -1849,17 +1728,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -1868,18 +1747,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -1889,7 +1767,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1899,7 +1776,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1909,7 +1785,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1919,7 +1794,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1930,7 +1804,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1940,7 +1813,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1949,12 +1821,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Glutton`'s events
@@ -1964,7 +1836,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pallet has been (re)initialized.
      **/
     PalletInitialized: GenericPalletEvent<
-      Rv,
       'Glutton',
       'PalletInitialized',
       {
@@ -1979,7 +1850,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The computation limit has been updated.
      **/
     ComputationLimitSet: GenericPalletEvent<
-      Rv,
       'Glutton',
       'ComputationLimitSet',
       {
@@ -1994,7 +1864,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The storage limit has been updated.
      **/
     StorageLimitSet: GenericPalletEvent<
-      Rv,
       'Glutton',
       'StorageLimitSet',
       {
@@ -2009,7 +1878,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The block length limit has been updated.
      **/
     BlockLengthLimitSet: GenericPalletEvent<
-      Rv,
       'Glutton',
       'BlockLengthLimitSet',
       {
@@ -2023,7 +1891,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -2032,22 +1900,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -2056,14 +1924,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: KitchensinkRuntimeProxyType; disambiguationIndex: number }
@@ -2072,13 +1939,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: KitchensinkRuntimeProxyType; delay: number }
@@ -2088,7 +1954,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: KitchensinkRuntimeProxyType; delay: number }
@@ -2098,7 +1963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -2107,7 +1971,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -2117,7 +1981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -2127,7 +1990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -2137,7 +1999,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -2153,7 +2014,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -2163,7 +2023,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -2172,7 +2031,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -2181,28 +2040,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -2211,37 +2069,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Tips`'s events
@@ -2250,32 +2108,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new tip suggestion has been opened.
      **/
-    NewTip: GenericPalletEvent<Rv, 'Tips', 'NewTip', { tipHash: H256 }>;
+    NewTip: GenericPalletEvent<'Tips', 'NewTip', { tipHash: H256 }>;
 
     /**
      * A tip suggestion has reached threshold and is closing.
      **/
-    TipClosing: GenericPalletEvent<Rv, 'Tips', 'TipClosing', { tipHash: H256 }>;
+    TipClosing: GenericPalletEvent<'Tips', 'TipClosing', { tipHash: H256 }>;
 
     /**
      * A tip suggestion has been closed.
      **/
-    TipClosed: GenericPalletEvent<Rv, 'Tips', 'TipClosed', { tipHash: H256; who: AccountId32; payout: bigint }>;
+    TipClosed: GenericPalletEvent<'Tips', 'TipClosed', { tipHash: H256; who: AccountId32; payout: bigint }>;
 
     /**
      * A tip suggestion has been retracted.
      **/
-    TipRetracted: GenericPalletEvent<Rv, 'Tips', 'TipRetracted', { tipHash: H256 }>;
+    TipRetracted: GenericPalletEvent<'Tips', 'TipRetracted', { tipHash: H256 }>;
 
     /**
      * A tip suggestion has been slashed.
      **/
-    TipSlashed: GenericPalletEvent<Rv, 'Tips', 'TipSlashed', { tipHash: H256; finder: AccountId32; deposit: bigint }>;
+    TipSlashed: GenericPalletEvent<'Tips', 'TipSlashed', { tipHash: H256; finder: AccountId32; deposit: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -2284,18 +2142,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2304,13 +2161,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2319,33 +2175,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2355,7 +2210,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2364,23 +2218,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2389,13 +2242,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2405,7 +2257,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2416,7 +2267,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2425,13 +2275,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2440,27 +2289,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssets`'s events
@@ -2469,23 +2318,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Created',
-      { assetId: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'PoolAssets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2494,13 +2337,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2509,33 +2351,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'PoolAssets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'PoolAssets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'PoolAssets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'PoolAssets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2545,7 +2386,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2554,23 +2394,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'PoolAssets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'PoolAssets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'PoolAssets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'PoolAssets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2579,13 +2418,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'PoolAssets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'PoolAssets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2595,7 +2433,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2606,7 +2443,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2615,13 +2451,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2630,32 +2465,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Touched',
-      { assetId: number; who: AccountId32; depositor: AccountId32 }
-    >;
+    Touched: GenericPalletEvent<'PoolAssets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Lottery`'s events
@@ -2664,27 +2494,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A lottery has been started!
      **/
-    LotteryStarted: GenericPalletEvent<Rv, 'Lottery', 'LotteryStarted', null>;
+    LotteryStarted: GenericPalletEvent<'Lottery', 'LotteryStarted', null>;
 
     /**
      * A new set of calls have been set!
      **/
-    CallsUpdated: GenericPalletEvent<Rv, 'Lottery', 'CallsUpdated', null>;
+    CallsUpdated: GenericPalletEvent<'Lottery', 'CallsUpdated', null>;
 
     /**
      * A winner has been chosen!
      **/
-    Winner: GenericPalletEvent<Rv, 'Lottery', 'Winner', { winner: AccountId32; lotteryBalance: bigint }>;
+    Winner: GenericPalletEvent<'Lottery', 'Winner', { winner: AccountId32; lotteryBalance: bigint }>;
 
     /**
      * A ticket has been bought!
      **/
-    TicketBought: GenericPalletEvent<Rv, 'Lottery', 'TicketBought', { who: AccountId32; callIndex: [number, number] }>;
+    TicketBought: GenericPalletEvent<'Lottery', 'TicketBought', { who: AccountId32; callIndex: [number, number] }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nis`'s events
@@ -2693,23 +2523,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bid was successfully placed.
      **/
-    BidPlaced: GenericPalletEvent<Rv, 'Nis', 'BidPlaced', { who: AccountId32; amount: bigint; duration: number }>;
+    BidPlaced: GenericPalletEvent<'Nis', 'BidPlaced', { who: AccountId32; amount: bigint; duration: number }>;
 
     /**
      * A bid was successfully removed (before being accepted).
      **/
-    BidRetracted: GenericPalletEvent<Rv, 'Nis', 'BidRetracted', { who: AccountId32; amount: bigint; duration: number }>;
+    BidRetracted: GenericPalletEvent<'Nis', 'BidRetracted', { who: AccountId32; amount: bigint; duration: number }>;
 
     /**
      * A bid was dropped from a queue because of another, more substantial, bid was present.
      **/
-    BidDropped: GenericPalletEvent<Rv, 'Nis', 'BidDropped', { who: AccountId32; amount: bigint; duration: number }>;
+    BidDropped: GenericPalletEvent<'Nis', 'BidDropped', { who: AccountId32; amount: bigint; duration: number }>;
 
     /**
      * A bid was accepted. The balance may not be released until expiry.
      **/
     Issued: GenericPalletEvent<
-      Rv,
       'Nis',
       'Issued',
       {
@@ -2744,7 +2573,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An receipt has been (at least partially) thawed.
      **/
     Thawed: GenericPalletEvent<
-      Rv,
       'Nis',
       'Thawed',
       {
@@ -2778,17 +2606,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An automatic funding of the deficit was made.
      **/
-    Funded: GenericPalletEvent<Rv, 'Nis', 'Funded', { deficit: bigint }>;
+    Funded: GenericPalletEvent<'Nis', 'Funded', { deficit: bigint }>;
 
     /**
      * A receipt was transferred.
      **/
-    Transferred: GenericPalletEvent<Rv, 'Nis', 'Transferred', { from: AccountId32; to: AccountId32; index: number }>;
+    Transferred: GenericPalletEvent<'Nis', 'Transferred', { from: AccountId32; to: AccountId32; index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -2797,33 +2625,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -2832,38 +2654,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: number; item: number }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: number; item: number }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: number; item: number }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: number; item: number }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: number }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: number }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: number }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2874,7 +2695,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2885,7 +2705,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2894,13 +2713,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: number }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: number; data: Bytes; isFrozen: boolean }
@@ -2909,13 +2727,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: number; item: number; data: Bytes; isFrozen: boolean }
@@ -2924,23 +2741,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: number; item: number }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: number; item: number }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: number; successfulItems: Array<number> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: number; maybeItem?: number | undefined; key: Bytes; value: Bytes }
@@ -2950,7 +2761,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes }
@@ -2960,7 +2770,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2970,7 +2779,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2980,7 +2788,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2989,13 +2796,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -3004,7 +2810,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nfts`'s events
@@ -3013,33 +2819,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Nfts', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Nfts', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Nfts', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Nfts',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -3048,23 +2848,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` became non-transferable.
      **/
-    ItemTransferLocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
+    ItemTransferLocked: GenericPalletEvent<'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
 
     /**
      * An `item` became transferable.
      **/
-    ItemTransferUnlocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
+    ItemTransferUnlocked: GenericPalletEvent<'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
 
     /**
      * `item` metadata or attributes were locked.
      **/
     ItemPropertiesLocked: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPropertiesLocked',
       { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean }
@@ -3073,18 +2872,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some `collection` was locked.
      **/
-    CollectionLocked: GenericPalletEvent<Rv, 'Nfts', 'CollectionLocked', { collection: number }>;
+    CollectionLocked: GenericPalletEvent<'Nfts', 'CollectionLocked', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TeamChanged',
       {
@@ -3100,7 +2898,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     TransferApproved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TransferApproved',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32; deadline?: number | undefined }
@@ -3111,7 +2908,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -3121,7 +2917,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All approvals of an item got cancelled.
      **/
     AllApprovalsCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AllApprovalsCancelled',
       { collection: number; item: number; owner: AccountId32 }
@@ -3130,43 +2925,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its config changed by the `Force` origin.
      **/
-    CollectionConfigChanged: GenericPalletEvent<Rv, 'Nfts', 'CollectionConfigChanged', { collection: number }>;
+    CollectionConfigChanged: GenericPalletEvent<'Nfts', 'CollectionConfigChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
-    CollectionMetadataSet: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
+    CollectionMetadataSet: GenericPalletEvent<'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Nfts', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
-    ItemMetadataSet: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'ItemMetadataSet',
-      { collection: number; item: number; data: Bytes }
-    >;
+    ItemMetadataSet: GenericPalletEvent<'Nfts', 'ItemMetadataSet', { collection: number; item: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    ItemMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
+    ItemMetadataCleared: GenericPalletEvent<'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
 
     /**
      * The deposit for a set of `item`s within a `collection` has been updated.
      **/
-    Redeposited: GenericPalletEvent<Rv, 'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
+    Redeposited: GenericPalletEvent<'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeSet',
       {
@@ -3182,7 +2971,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes; namespace: PalletNftsAttributeNamespace }
@@ -3192,7 +2980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was added.
      **/
     ItemAttributesApprovalAdded: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalAdded',
       { collection: number; item: number; delegate: AccountId32 }
@@ -3202,7 +2989,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was removed.
      **/
     ItemAttributesApprovalRemoved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalRemoved',
       { collection: number; item: number; delegate: AccountId32 }
@@ -3212,7 +2998,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -3222,7 +3007,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -3231,18 +3015,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Mint settings for a collection had changed.
      **/
-    CollectionMintSettingsUpdated: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'CollectionMintSettingsUpdated',
-      { collection: number }
-    >;
+    CollectionMintSettingsUpdated: GenericPalletEvent<'Nfts', 'CollectionMintSettingsUpdated', { collection: number }>;
 
     /**
      * Event gets emitted when the `NextCollectionId` gets incremented.
      **/
     NextCollectionIdIncremented: GenericPalletEvent<
-      Rv,
       'Nfts',
       'NextCollectionIdIncremented',
       { nextId?: number | undefined }
@@ -3252,7 +3030,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the item.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -3261,13 +3038,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the item was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -3277,7 +3053,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A tip was sent.
      **/
     TipSent: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TipSent',
       { collection: number; item: number; sender: AccountId32; receiver: AccountId32; amount: bigint }
@@ -3287,7 +3062,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An `item` swap intent was created.
      **/
     SwapCreated: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCreated',
       {
@@ -3304,7 +3078,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap was cancelled.
      **/
     SwapCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCancelled',
       {
@@ -3321,7 +3094,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap has been claimed.
      **/
     SwapClaimed: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapClaimed',
       {
@@ -3340,7 +3112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New attributes have been set for an `item` of the `collection`.
      **/
     PreSignedAttributesSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PreSignedAttributesSet',
       { collection: number; item: number; namespace: PalletNftsAttributeNamespace }
@@ -3351,7 +3122,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * within that `collection`.
      **/
     PalletAttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PalletAttributeSet',
       { collection: number; item?: number | undefined; attribute: PalletNftsPalletAttributes; value: Bytes }
@@ -3360,7 +3130,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NftFractionalization`'s events
@@ -3370,7 +3140,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully fractionalized.
      **/
     NftFractionalized: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftFractionalized',
       { nftCollection: number; nft: number; fractions: bigint; asset: number; beneficiary: AccountId32 }
@@ -3380,7 +3149,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully returned back.
      **/
     NftUnified: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftUnified',
       { nftCollection: number; nft: number; asset: number; beneficiary: AccountId32 }
@@ -3389,7 +3157,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Salary`'s events
@@ -3398,37 +3166,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A member is inducted into the payroll.
      **/
-    Inducted: GenericPalletEvent<Rv, 'Salary', 'Inducted', { who: AccountId32 }>;
+    Inducted: GenericPalletEvent<'Salary', 'Inducted', { who: AccountId32 }>;
 
     /**
      * A member registered for a payout.
      **/
-    Registered: GenericPalletEvent<Rv, 'Salary', 'Registered', { who: AccountId32; amount: bigint }>;
+    Registered: GenericPalletEvent<'Salary', 'Registered', { who: AccountId32; amount: bigint }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<
-      Rv,
-      'Salary',
-      'Paid',
-      { who: AccountId32; beneficiary: AccountId32; amount: bigint; id: [] }
-    >;
+    Paid: GenericPalletEvent<'Salary', 'Paid', { who: AccountId32; beneficiary: AccountId32; amount: bigint; id: [] }>;
 
     /**
      * The next cycle begins.
      **/
-    CycleStarted: GenericPalletEvent<Rv, 'Salary', 'CycleStarted', { index: number }>;
+    CycleStarted: GenericPalletEvent<'Salary', 'CycleStarted', { index: number }>;
 
     /**
      * A member swapped their account.
      **/
-    Swapped: GenericPalletEvent<Rv, 'Salary', 'Swapped', { who: AccountId32; newWho: AccountId32 }>;
+    Swapped: GenericPalletEvent<'Salary', 'Swapped', { who: AccountId32; newWho: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CoreFellowship`'s events
@@ -3437,60 +3200,49 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Parameters for the pallet have changed.
      **/
-    ParamsChanged: GenericPalletEvent<
-      Rv,
-      'CoreFellowship',
-      'ParamsChanged',
-      { params: PalletCoreFellowshipParamsType }
-    >;
+    ParamsChanged: GenericPalletEvent<'CoreFellowship', 'ParamsChanged', { params: PalletCoreFellowshipParamsType }>;
 
     /**
      * Member activity flag has been set.
      **/
-    ActiveChanged: GenericPalletEvent<Rv, 'CoreFellowship', 'ActiveChanged', { who: AccountId32; isActive: boolean }>;
+    ActiveChanged: GenericPalletEvent<'CoreFellowship', 'ActiveChanged', { who: AccountId32; isActive: boolean }>;
 
     /**
      * Member has begun being tracked in this pallet.
      **/
-    Inducted: GenericPalletEvent<Rv, 'CoreFellowship', 'Inducted', { who: AccountId32 }>;
+    Inducted: GenericPalletEvent<'CoreFellowship', 'Inducted', { who: AccountId32 }>;
 
     /**
      * Member has been removed from being tracked in this pallet (i.e. because rank is now
      * zero).
      **/
-    Offboarded: GenericPalletEvent<Rv, 'CoreFellowship', 'Offboarded', { who: AccountId32 }>;
+    Offboarded: GenericPalletEvent<'CoreFellowship', 'Offboarded', { who: AccountId32 }>;
 
     /**
      * Member has been promoted to the given rank.
      **/
-    Promoted: GenericPalletEvent<Rv, 'CoreFellowship', 'Promoted', { who: AccountId32; toRank: number }>;
+    Promoted: GenericPalletEvent<'CoreFellowship', 'Promoted', { who: AccountId32; toRank: number }>;
 
     /**
      * Member has been demoted to the given (non-zero) rank.
      **/
-    Demoted: GenericPalletEvent<Rv, 'CoreFellowship', 'Demoted', { who: AccountId32; toRank: number }>;
+    Demoted: GenericPalletEvent<'CoreFellowship', 'Demoted', { who: AccountId32; toRank: number }>;
 
     /**
      * Member has been proven at their current rank, postponing auto-demotion.
      **/
-    Proven: GenericPalletEvent<Rv, 'CoreFellowship', 'Proven', { who: AccountId32; atRank: number }>;
+    Proven: GenericPalletEvent<'CoreFellowship', 'Proven', { who: AccountId32; atRank: number }>;
 
     /**
      * Member has stated evidence of their efforts their request for rank.
      **/
-    Requested: GenericPalletEvent<
-      Rv,
-      'CoreFellowship',
-      'Requested',
-      { who: AccountId32; wish: PalletCoreFellowshipWish }
-    >;
+    Requested: GenericPalletEvent<'CoreFellowship', 'Requested', { who: AccountId32; wish: PalletCoreFellowshipWish }>;
 
     /**
      * Some submitted evidence was judged and removed. There may or may not have been a change
      * to the rank, but in any case, `last_proof` is reset.
      **/
     EvidenceJudged: GenericPalletEvent<
-      Rv,
       'CoreFellowship',
       'EvidenceJudged',
       {
@@ -3524,17 +3276,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Pre-ranked account has been inducted at their current rank.
      **/
-    Imported: GenericPalletEvent<Rv, 'CoreFellowship', 'Imported', { who: AccountId32; rank: number }>;
+    Imported: GenericPalletEvent<'CoreFellowship', 'Imported', { who: AccountId32; rank: number }>;
 
     /**
      * A member had its AccountId swapped.
      **/
-    Swapped: GenericPalletEvent<Rv, 'CoreFellowship', 'Swapped', { who: AccountId32; newWho: AccountId32 }>;
+    Swapped: GenericPalletEvent<'CoreFellowship', 'Swapped', { who: AccountId32; newWho: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionStorage`'s events
@@ -3543,22 +3295,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Stored data under specified index.
      **/
-    Stored: GenericPalletEvent<Rv, 'TransactionStorage', 'Stored', { index: number }>;
+    Stored: GenericPalletEvent<'TransactionStorage', 'Stored', { index: number }>;
 
     /**
      * Renewed data under specified index.
      **/
-    Renewed: GenericPalletEvent<Rv, 'TransactionStorage', 'Renewed', { index: number }>;
+    Renewed: GenericPalletEvent<'TransactionStorage', 'Renewed', { index: number }>;
 
     /**
      * Storage proof was successfully checked.
      **/
-    ProofChecked: GenericPalletEvent<Rv, 'TransactionStorage', 'ProofChecked', null>;
+    ProofChecked: GenericPalletEvent<'TransactionStorage', 'ProofChecked', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -3567,17 +3319,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -3588,7 +3340,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -3597,22 +3348,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -3621,13 +3372,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -3637,7 +3387,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -3646,12 +3395,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -3661,7 +3410,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -3686,7 +3434,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -3711,7 +3458,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -3736,7 +3482,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -3756,7 +3501,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -3782,7 +3526,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -3793,7 +3536,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -3808,7 +3550,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -3828,7 +3569,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -3843,7 +3583,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -3863,7 +3602,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -3883,7 +3621,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -3903,7 +3640,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -3923,7 +3659,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -3948,7 +3683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -3968,7 +3702,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -3987,7 +3720,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Remark`'s events
@@ -3996,12 +3729,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Stored data off chain.
      **/
-    Stored: GenericPalletEvent<Rv, 'Remark', 'Stored', { sender: AccountId32; contentHash: H256 }>;
+    Stored: GenericPalletEvent<'Remark', 'Stored', { sender: AccountId32; contentHash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RootTesting`'s events
@@ -4010,12 +3743,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Event dispatched when the trigger_defensive extrinsic is called.
      **/
-    DefensiveTestCall: GenericPalletEvent<Rv, 'RootTesting', 'DefensiveTestCall', undefined>;
+    DefensiveTestCall: GenericPalletEvent<'RootTesting', 'DefensiveTestCall', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -4024,18 +3757,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -4045,7 +3777,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -4054,21 +3785,20 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -4077,7 +3807,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AllianceMotion`'s events
@@ -4088,7 +3818,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `MemberCount`).
      **/
     Proposed: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'Proposed',
       { account: AccountId32; proposalIndex: number; proposalHash: H256; threshold: number }
@@ -4099,7 +3828,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a tally (yes votes and no votes given respectively as `MemberCount`).
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'Voted',
       { account: AccountId32; proposalHash: H256; voted: boolean; yes: number; no: number }
@@ -4108,18 +3836,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A motion was approved by the required threshold.
      **/
-    Approved: GenericPalletEvent<Rv, 'AllianceMotion', 'Approved', { proposalHash: H256 }>;
+    Approved: GenericPalletEvent<'AllianceMotion', 'Approved', { proposalHash: H256 }>;
 
     /**
      * A motion was not approved by the required threshold.
      **/
-    Disapproved: GenericPalletEvent<Rv, 'AllianceMotion', 'Disapproved', { proposalHash: H256 }>;
+    Disapproved: GenericPalletEvent<'AllianceMotion', 'Disapproved', { proposalHash: H256 }>;
 
     /**
      * A motion was executed; result will be `Ok` if it returned without error.
      **/
     Executed: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'Executed',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -4129,7 +3856,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A single member did some action; result will be `Ok` if it returned without error.
      **/
     MemberExecuted: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'MemberExecuted',
       { proposalHash: H256; result: Result<[], DispatchError> }
@@ -4138,18 +3864,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proposal was closed because its threshold was reached or after its duration was up.
      **/
-    Closed: GenericPalletEvent<Rv, 'AllianceMotion', 'Closed', { proposalHash: H256; yes: number; no: number }>;
+    Closed: GenericPalletEvent<'AllianceMotion', 'Closed', { proposalHash: H256; yes: number; no: number }>;
 
     /**
      * A proposal was killed.
      **/
-    Killed: GenericPalletEvent<Rv, 'AllianceMotion', 'Killed', { proposalHash: H256 }>;
+    Killed: GenericPalletEvent<'AllianceMotion', 'Killed', { proposalHash: H256 }>;
 
     /**
      * Some cost for storing a proposal was burned.
      **/
     ProposalCostBurned: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'ProposalCostBurned',
       { proposalHash: H256; who: AccountId32 }
@@ -4159,7 +3884,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some cost for storing a proposal was released.
      **/
     ProposalCostReleased: GenericPalletEvent<
-      Rv,
       'AllianceMotion',
       'ProposalCostReleased',
       { proposalHash: H256; who: AccountId32 }
@@ -4168,7 +3892,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Alliance`'s events
@@ -4177,23 +3901,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new rule has been set.
      **/
-    NewRuleSet: GenericPalletEvent<Rv, 'Alliance', 'NewRuleSet', { rule: PalletAllianceCid }>;
+    NewRuleSet: GenericPalletEvent<'Alliance', 'NewRuleSet', { rule: PalletAllianceCid }>;
 
     /**
      * A new announcement has been proposed.
      **/
-    Announced: GenericPalletEvent<Rv, 'Alliance', 'Announced', { announcement: PalletAllianceCid }>;
+    Announced: GenericPalletEvent<'Alliance', 'Announced', { announcement: PalletAllianceCid }>;
 
     /**
      * An on-chain announcement has been removed.
      **/
-    AnnouncementRemoved: GenericPalletEvent<Rv, 'Alliance', 'AnnouncementRemoved', { announcement: PalletAllianceCid }>;
+    AnnouncementRemoved: GenericPalletEvent<'Alliance', 'AnnouncementRemoved', { announcement: PalletAllianceCid }>;
 
     /**
      * Some accounts have been initialized as members (fellows/allies).
      **/
     MembersInitialized: GenericPalletEvent<
-      Rv,
       'Alliance',
       'MembersInitialized',
       { fellows: Array<AccountId32>; allies: Array<AccountId32> }
@@ -4203,7 +3926,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account has been added as an Ally and reserved its deposit.
      **/
     NewAllyJoined: GenericPalletEvent<
-      Rv,
       'Alliance',
       'NewAllyJoined',
       { ally: AccountId32; nominator?: AccountId32 | undefined; reserved?: bigint | undefined }
@@ -4212,13 +3934,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An ally has been elevated to Fellow.
      **/
-    AllyElevated: GenericPalletEvent<Rv, 'Alliance', 'AllyElevated', { ally: AccountId32 }>;
+    AllyElevated: GenericPalletEvent<'Alliance', 'AllyElevated', { ally: AccountId32 }>;
 
     /**
      * A member gave retirement notice and their retirement period started.
      **/
     MemberRetirementPeriodStarted: GenericPalletEvent<
-      Rv,
       'Alliance',
       'MemberRetirementPeriodStarted',
       { member: AccountId32 }
@@ -4228,7 +3949,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A member has retired with its deposit unreserved.
      **/
     MemberRetired: GenericPalletEvent<
-      Rv,
       'Alliance',
       'MemberRetired',
       { member: AccountId32; unreserved?: bigint | undefined }
@@ -4237,18 +3957,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A member has been kicked out with its deposit slashed.
      **/
-    MemberKicked: GenericPalletEvent<
-      Rv,
-      'Alliance',
-      'MemberKicked',
-      { member: AccountId32; slashed?: bigint | undefined }
-    >;
+    MemberKicked: GenericPalletEvent<'Alliance', 'MemberKicked', { member: AccountId32; slashed?: bigint | undefined }>;
 
     /**
      * Accounts or websites have been added into the list of unscrupulous items.
      **/
     UnscrupulousItemAdded: GenericPalletEvent<
-      Rv,
       'Alliance',
       'UnscrupulousItemAdded',
       { items: Array<PalletAllianceUnscrupulousItem> }
@@ -4258,7 +3972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Accounts or websites have been removed from the list of unscrupulous items.
      **/
     UnscrupulousItemRemoved: GenericPalletEvent<
-      Rv,
       'Alliance',
       'UnscrupulousItemRemoved',
       { items: Array<PalletAllianceUnscrupulousItem> }
@@ -4268,7 +3981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Alliance disbanded. Includes number deleted members and unreserved deposits.
      **/
     AllianceDisbanded: GenericPalletEvent<
-      Rv,
       'Alliance',
       'AllianceDisbanded',
       { fellowMembers: number; allyMembers: number; unreserved: number }
@@ -4277,12 +3989,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A Fellow abdicated their voting rights. They are now an Ally.
      **/
-    FellowAbdicated: GenericPalletEvent<Rv, 'Alliance', 'FellowAbdicated', { fellow: AccountId32 }>;
+    FellowAbdicated: GenericPalletEvent<'Alliance', 'FellowAbdicated', { fellow: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -4291,13 +4003,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -4306,12 +4017,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -4327,7 +4033,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -4342,7 +4047,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -4351,13 +4055,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -4371,7 +4074,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -4382,7 +4084,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -4391,13 +4092,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -4407,7 +4107,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -4417,7 +4116,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -4427,7 +4125,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -4437,7 +4134,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -4447,7 +4143,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -4457,7 +4152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -4467,7 +4161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -4477,7 +4170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -4486,19 +4178,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -4508,7 +4194,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -4518,7 +4203,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -4534,7 +4218,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RankedPolls`'s events
@@ -4544,7 +4228,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Submitted',
       {
@@ -4569,7 +4252,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'DecisionDepositPlaced',
       {
@@ -4594,7 +4276,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'DecisionDepositRefunded',
       {
@@ -4619,7 +4300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'DepositSlashed',
       {
@@ -4639,7 +4319,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'DecisionStarted',
       {
@@ -4665,7 +4344,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'ConfirmStarted',
       {
@@ -4676,7 +4354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'ConfirmAborted',
       {
@@ -4691,7 +4368,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Confirmed',
       {
@@ -4711,7 +4387,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Approved',
       {
@@ -4726,7 +4401,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Rejected',
       {
@@ -4746,7 +4420,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'TimedOut',
       {
@@ -4766,7 +4439,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Cancelled',
       {
@@ -4786,7 +4458,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'Killed',
       {
@@ -4806,7 +4477,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'SubmissionDepositRefunded',
       {
@@ -4831,7 +4501,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'MetadataSet',
       {
@@ -4851,7 +4520,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'RankedPolls',
       'MetadataCleared',
       {
@@ -4870,7 +4538,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RankedCollective`'s events
@@ -4879,24 +4547,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A member `who` has been added.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'RankedCollective', 'MemberAdded', { who: AccountId32 }>;
+    MemberAdded: GenericPalletEvent<'RankedCollective', 'MemberAdded', { who: AccountId32 }>;
 
     /**
      * The member `who`se rank has been changed to the given `rank`.
      **/
-    RankChanged: GenericPalletEvent<Rv, 'RankedCollective', 'RankChanged', { who: AccountId32; rank: number }>;
+    RankChanged: GenericPalletEvent<'RankedCollective', 'RankChanged', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` of given `rank` has been removed from the collective.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'RankedCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
+    MemberRemoved: GenericPalletEvent<'RankedCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` has voted for the `poll` with the given `vote` leading to an updated
      * `tally`.
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'RankedCollective',
       'Voted',
       { who: AccountId32; poll: number; vote: PalletRankedCollectiveVoteRecord; tally: PalletRankedCollectiveTally }
@@ -4906,7 +4573,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The member `who` had their `AccountId` changed to `new_who`.
      **/
     MemberExchanged: GenericPalletEvent<
-      Rv,
       'RankedCollective',
       'MemberExchanged',
       { who: AccountId32; newWho: AccountId32 }
@@ -4915,7 +4581,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversion`'s events
@@ -4925,7 +4591,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `CreatePool` extrinsic will create this event.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'PoolCreated',
       {
@@ -4957,7 +4622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `AddLiquidity` extrinsic will create this event.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityAdded',
       {
@@ -5002,7 +4666,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `RemoveLiquidity` extrinsic will create this event.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityRemoved',
       {
@@ -5053,7 +4716,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and `SwapTokenForExactToken` will generate this event.
      **/
     SwapExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapExecuted',
       {
@@ -5089,7 +4751,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Assets have been converted from one to another.
      **/
     SwapCreditExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapCreditExecuted',
       {
@@ -5115,7 +4776,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool has been touched in order to fulfill operational requirements.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'Touched',
       {
@@ -5134,7 +4794,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -5143,22 +4803,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -5166,17 +4821,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -5186,7 +4841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -5214,7 +4868,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -5249,7 +4902,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -5279,7 +4931,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -5298,18 +4949,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Pov`'s events
    **/
   pov: {
-    TestEvent: GenericPalletEvent<Rv, 'Pov', 'TestEvent', undefined>;
+    TestEvent: GenericPalletEvent<'Pov', 'TestEvent', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TxPause`'s events
@@ -5318,17 +4969,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * This pallet, or a specific call is now paused.
      **/
-    CallPaused: GenericPalletEvent<Rv, 'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
+    CallPaused: GenericPalletEvent<'TxPause', 'CallPaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * This pallet, or a specific call is now unpaused.
      **/
-    CallUnpaused: GenericPalletEvent<Rv, 'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
+    CallUnpaused: GenericPalletEvent<'TxPause', 'CallUnpaused', { fullName: [Bytes, Bytes] }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SafeMode`'s events
@@ -5337,51 +4988,51 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The safe-mode was entered until inclusively this block.
      **/
-    Entered: GenericPalletEvent<Rv, 'SafeMode', 'Entered', { until: number }>;
+    Entered: GenericPalletEvent<'SafeMode', 'Entered', { until: number }>;
 
     /**
      * The safe-mode was extended until inclusively this block.
      **/
-    Extended: GenericPalletEvent<Rv, 'SafeMode', 'Extended', { until: number }>;
+    Extended: GenericPalletEvent<'SafeMode', 'Extended', { until: number }>;
 
     /**
      * Exited the safe-mode for a specific reason.
      **/
-    Exited: GenericPalletEvent<Rv, 'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
+    Exited: GenericPalletEvent<'SafeMode', 'Exited', { reason: PalletSafeModeExitReason }>;
 
     /**
      * An account reserved funds for either entering or extending the safe-mode.
      **/
-    DepositPlaced: GenericPalletEvent<Rv, 'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
+    DepositPlaced: GenericPalletEvent<'SafeMode', 'DepositPlaced', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had a reserve released that was reserved.
      **/
-    DepositReleased: GenericPalletEvent<Rv, 'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
+    DepositReleased: GenericPalletEvent<'SafeMode', 'DepositReleased', { account: AccountId32; amount: bigint }>;
 
     /**
      * An account had reserve slashed that was reserved.
      **/
-    DepositSlashed: GenericPalletEvent<Rv, 'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
+    DepositSlashed: GenericPalletEvent<'SafeMode', 'DepositSlashed', { account: AccountId32; amount: bigint }>;
 
     /**
      * Could not hold funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotDeposit: GenericPalletEvent<Rv, 'SafeMode', 'CannotDeposit', null>;
+    CannotDeposit: GenericPalletEvent<'SafeMode', 'CannotDeposit', null>;
 
     /**
      * Could not release funds for entering or extending the safe-mode.
      *
      * This error comes from the underlying `Currency`.
      **/
-    CannotRelease: GenericPalletEvent<Rv, 'SafeMode', 'CannotRelease', null>;
+    CannotRelease: GenericPalletEvent<'SafeMode', 'CannotRelease', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Statement`'s events
@@ -5391,7 +5042,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new statement is submitted
      **/
     NewStatement: GenericPalletEvent<
-      Rv,
       'Statement',
       'NewStatement',
       { account: AccountId32; statement: SpStatementStoreStatement }
@@ -5400,7 +5050,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -5412,7 +5062,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -5431,20 +5080,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -5459,7 +5107,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -5479,7 +5126,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -5501,7 +5147,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -5521,7 +5166,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -5535,7 +5179,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Broker`'s events
@@ -5545,7 +5189,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region of Bulk Coretime has been purchased.
      **/
     Purchased: GenericPalletEvent<
-      Rv,
       'Broker',
       'Purchased',
       {
@@ -5575,7 +5218,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The workload of a core has become renewable.
      **/
     Renewable: GenericPalletEvent<
-      Rv,
       'Broker',
       'Renewable',
       {
@@ -5607,7 +5249,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A workload has been renewed.
      **/
     Renewed: GenericPalletEvent<
-      Rv,
       'Broker',
       'Renewed',
       {
@@ -5652,7 +5293,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership of a Region has been transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Broker',
       'Transferred',
       {
@@ -5682,7 +5322,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region has been split into two non-overlapping Regions.
      **/
     Partitioned: GenericPalletEvent<
-      Rv,
       'Broker',
       'Partitioned',
       {
@@ -5702,7 +5341,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region has been converted into two overlapping Regions each of lesser regularity.
      **/
     Interlaced: GenericPalletEvent<
-      Rv,
       'Broker',
       'Interlaced',
       {
@@ -5722,7 +5360,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region has been assigned to a particular task.
      **/
     Assigned: GenericPalletEvent<
-      Rv,
       'Broker',
       'Assigned',
       {
@@ -5747,7 +5384,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An assignment has been removed from the workplan.
      **/
     AssignmentRemoved: GenericPalletEvent<
-      Rv,
       'Broker',
       'AssignmentRemoved',
       {
@@ -5762,7 +5398,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region has been added to the Instantaneous Coretime Pool.
      **/
     Pooled: GenericPalletEvent<
-      Rv,
       'Broker',
       'Pooled',
       {
@@ -5782,7 +5417,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new number of cores has been requested.
      **/
     CoreCountRequested: GenericPalletEvent<
-      Rv,
       'Broker',
       'CoreCountRequested',
       {
@@ -5797,7 +5431,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The number of cores available for scheduling has changed.
      **/
     CoreCountChanged: GenericPalletEvent<
-      Rv,
       'Broker',
       'CoreCountChanged',
       {
@@ -5812,7 +5445,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * There is a new reservation for a workload.
      **/
     ReservationMade: GenericPalletEvent<
-      Rv,
       'Broker',
       'ReservationMade',
       {
@@ -5832,7 +5464,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A reservation for a workload has been cancelled.
      **/
     ReservationCancelled: GenericPalletEvent<
-      Rv,
       'Broker',
       'ReservationCancelled',
       {
@@ -5852,7 +5483,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new sale has been initialized.
      **/
     SaleInitialized: GenericPalletEvent<
-      Rv,
       'Broker',
       'SaleInitialized',
       {
@@ -5904,7 +5534,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new lease has been created.
      **/
     Leased: GenericPalletEvent<
-      Rv,
       'Broker',
       'Leased',
       {
@@ -5926,7 +5555,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A lease has been removed.
      **/
     LeaseRemoved: GenericPalletEvent<
-      Rv,
       'Broker',
       'LeaseRemoved',
       {
@@ -5941,7 +5569,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A lease is about to end.
      **/
     LeaseEnding: GenericPalletEvent<
-      Rv,
       'Broker',
       'LeaseEnding',
       {
@@ -5961,7 +5588,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sale rotation has been started and a new sale is imminent.
      **/
     SalesStarted: GenericPalletEvent<
-      Rv,
       'Broker',
       'SalesStarted',
       {
@@ -5981,7 +5607,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The act of claiming revenue has begun.
      **/
     RevenueClaimBegun: GenericPalletEvent<
-      Rv,
       'Broker',
       'RevenueClaimBegun',
       {
@@ -6001,7 +5626,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A particular timeslice has a non-zero claim.
      **/
     RevenueClaimItem: GenericPalletEvent<
-      Rv,
       'Broker',
       'RevenueClaimItem',
       {
@@ -6021,7 +5645,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A revenue claim has (possibly only in part) been paid.
      **/
     RevenueClaimPaid: GenericPalletEvent<
-      Rv,
       'Broker',
       'RevenueClaimPaid',
       {
@@ -6046,7 +5669,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some Instantaneous Coretime Pool credit has been purchased.
      **/
     CreditPurchased: GenericPalletEvent<
-      Rv,
       'Broker',
       'CreditPurchased',
       {
@@ -6071,7 +5693,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Region has been dropped due to being out of date.
      **/
     RegionDropped: GenericPalletEvent<
-      Rv,
       'Broker',
       'RegionDropped',
       {
@@ -6091,7 +5712,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some historical Instantaneous Core Pool contribution record has been dropped.
      **/
     ContributionDropped: GenericPalletEvent<
-      Rv,
       'Broker',
       'ContributionDropped',
       {
@@ -6106,7 +5726,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some historical Instantaneous Core Pool payment record has been initialized.
      **/
     HistoryInitialized: GenericPalletEvent<
-      Rv,
       'Broker',
       'HistoryInitialized',
       {
@@ -6132,7 +5751,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some historical Instantaneous Core Pool payment record has been dropped.
      **/
     HistoryDropped: GenericPalletEvent<
-      Rv,
       'Broker',
       'HistoryDropped',
       {
@@ -6153,7 +5771,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * timeslice was already known. Governance may need to intervene.
      **/
     HistoryIgnored: GenericPalletEvent<
-      Rv,
       'Broker',
       'HistoryIgnored',
       {
@@ -6173,7 +5790,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some historical Instantaneous Core Pool Revenue is ready for payout claims.
      **/
     ClaimsReady: GenericPalletEvent<
-      Rv,
       'Broker',
       'ClaimsReady',
       {
@@ -6198,7 +5814,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Core has been assigned to one or more tasks and/or the Pool on the Relay-chain.
      **/
     CoreAssigned: GenericPalletEvent<
-      Rv,
       'Broker',
       'CoreAssigned',
       {
@@ -6223,7 +5838,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some historical Instantaneous Core Pool payment record has been dropped.
      **/
     PotentialRenewalDropped: GenericPalletEvent<
-      Rv,
       'Broker',
       'PotentialRenewalDropped',
       {
@@ -6239,7 +5853,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     AutoRenewalEnabled: GenericPalletEvent<
-      Rv,
       'Broker',
       'AutoRenewalEnabled',
       {
@@ -6255,7 +5868,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     AutoRenewalDisabled: GenericPalletEvent<
-      Rv,
       'Broker',
       'AutoRenewalDisabled',
       {
@@ -6276,7 +5888,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * funded.
      **/
     AutoRenewalFailed: GenericPalletEvent<
-      Rv,
       'Broker',
       'AutoRenewalFailed',
       {
@@ -6300,12 +5911,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This should never happen, given that enable_auto_renew checks for this before enabling
      * auto-renewal.
      **/
-    AutoRenewalLimitReached: GenericPalletEvent<Rv, 'Broker', 'AutoRenewalLimitReached', null>;
+    AutoRenewalLimitReached: GenericPalletEvent<'Broker', 'AutoRenewalLimitReached', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -6317,7 +5928,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -6341,7 +5951,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SkipFeelessPayment`'s events
@@ -6350,12 +5960,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A transaction fee was skipped.
      **/
-    FeeSkipped: GenericPalletEvent<Rv, 'SkipFeelessPayment', 'FeeSkipped', { origin: KitchensinkRuntimeOriginCaller }>;
+    FeeSkipped: GenericPalletEvent<'SkipFeelessPayment', 'FeeSkipped', { origin: KitchensinkRuntimeOriginCaller }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversionMigration`'s events
@@ -6365,7 +5975,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Indicates that a pool has been migrated to the new account ID.
      **/
     MigratedToNewAccount: GenericPalletEvent<
-      Rv,
       'AssetConversionMigration',
       'MigratedToNewAccount',
       {
@@ -6389,7 +5998,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Revive`'s events
@@ -6399,7 +6008,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Revive',
       'ContractEmitted',
       {
@@ -6425,7 +6033,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -6435,7 +6043,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -6445,7 +6052,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -6455,7 +6061,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -6465,7 +6070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -6474,7 +6078,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRewards`'s events
@@ -6484,7 +6088,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account staked some tokens in a pool.
      **/
     Staked: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'Staked',
       {
@@ -6509,7 +6112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account unstaked some tokens from a pool.
      **/
     Unstaked: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'Unstaked',
       {
@@ -6539,7 +6141,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account harvested some rewards.
      **/
     RewardsHarvested: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'RewardsHarvested',
       {
@@ -6569,7 +6170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new reward pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolCreated',
       {
@@ -6614,7 +6214,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool reward rate was modified by the admin.
      **/
     PoolRewardRateModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolRewardRateModified',
       {
@@ -6634,7 +6233,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool admin was modified.
      **/
     PoolAdminModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolAdminModified',
       {
@@ -6654,7 +6252,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool expiry block was modified by the admin.
      **/
     PoolExpiryBlockModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolExpiryBlockModified',
       {
@@ -6674,7 +6271,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool information was cleared after it's completion.
      **/
     PoolCleanedUp: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolCleanedUp',
       {
@@ -6688,19 +6284,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetsFreezer`'s events
    **/
   assetsFreezer: {
-    Frozen: GenericPalletEvent<Rv, 'AssetsFreezer', 'Frozen', { who: AccountId32; assetId: number; amount: bigint }>;
-    Thawed: GenericPalletEvent<Rv, 'AssetsFreezer', 'Thawed', { who: AccountId32; assetId: number; amount: bigint }>;
+    Frozen: GenericPalletEvent<'AssetsFreezer', 'Frozen', { who: AccountId32; assetId: number; amount: bigint }>;
+    Thawed: GenericPalletEvent<'AssetsFreezer', 'Thawed', { who: AccountId32; assetId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MetaTx`'s events
@@ -6713,7 +6309,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * information.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'MetaTx',
       'Dispatched',
       { result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -6722,6 +6317,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/substrate/index.d.ts b/packages/chaintypes/src/substrate/index.d.ts
index c1d9a349..70ca51a5 100644
--- a/packages/chaintypes/src/substrate/index.d.ts
+++ b/packages/chaintypes/src/substrate/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   KitchensinkRuntimeRuntimeCall,
@@ -15,6 +15,7 @@ import type {
   PalletAssetConversionTxPaymentChargeAssetTxPayment,
   FrameMetadataHashExtensionCheckMetadataHash,
   FrameSystemExtensionsWeightReclaim,
+  FrameSupportTokensFungibleUnionOfNativeOrWithId,
 } from './types.js';
 import { ChainConsts } from './consts.js';
 import { ChainStorage } from './query.js';
@@ -43,26 +44,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameMetadataHashExtensionCheckMetadataHash,
     FrameSystemExtensionsWeightReclaim,
   ];
-}
-
-export interface VersionedSubstrateApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: FrameSupportTokensFungibleUnionOfNativeOrWithId;
 }
 
 /**
  * @name: SubstrateApi
  * @specVersion: 268
  **/
-export interface SubstrateApi {
-  legacy: VersionedSubstrateApi<RpcLegacy>;
-  v2: VersionedSubstrateApi<RpcV2>;
+export interface SubstrateApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/substrate/json-rpc.d.ts b/packages/chaintypes/src/substrate/json-rpc.d.ts
index 090585da..bd274895 100644
--- a/packages/chaintypes/src/substrate/json-rpc.d.ts
+++ b/packages/chaintypes/src/substrate/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'author_hasKey'
   | 'author_hasSessionKeys'
@@ -101,4 +101,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/substrate/query.d.ts b/packages/chaintypes/src/substrate/query.d.ts
index 6f7d4d5c..42a04c8b 100644
--- a/packages/chaintypes/src/substrate/query.d.ts
+++ b/packages/chaintypes/src/substrate/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -185,7 +185,7 @@ import type {
   PalletAssetRewardsPoolInfo,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -196,35 +196,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -232,7 +232,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -240,28 +240,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -274,14 +274,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -298,21 +298,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -320,21 +320,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -347,12 +347,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -363,14 +363,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -378,14 +378,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -401,28 +401,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -437,7 +437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -445,7 +445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -453,7 +453,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -463,7 +463,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -474,7 +474,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -485,7 +485,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -493,7 +493,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -501,7 +501,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -515,12 +515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -531,7 +531,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -541,12 +541,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -557,12 +557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -574,12 +574,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -590,14 +590,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -628,7 +628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -639,7 +639,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -649,7 +649,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -657,7 +657,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -666,7 +666,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -674,7 +673,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -684,18 +683,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -711,14 +710,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -727,7 +726,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -737,7 +736,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -747,7 +746,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -757,7 +756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -772,7 +771,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -784,7 +783,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -799,7 +798,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -812,12 +810,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -828,14 +826,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -844,7 +842,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -854,28 +852,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -884,7 +882,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -895,7 +893,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -905,7 +903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -915,14 +913,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -931,7 +929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -957,14 +955,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -977,14 +975,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -993,7 +991,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -1003,7 +1001,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -1013,7 +1011,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -1024,7 +1022,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -1039,7 +1037,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -1059,7 +1057,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -1086,7 +1083,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -1103,7 +1099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -1119,7 +1114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -1132,7 +1127,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1145,7 +1139,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1154,7 +1148,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1163,14 +1157,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1179,7 +1173,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1188,7 +1182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1196,7 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1204,7 +1198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1214,7 +1208,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1224,7 +1218,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1236,7 +1229,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1248,7 +1240,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1261,7 +1252,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1273,7 +1263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1282,12 +1272,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1298,14 +1288,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1313,7 +1303,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1321,7 +1311,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, KitchensinkRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1332,7 +1322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1340,7 +1330,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<KitchensinkRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1349,7 +1339,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1357,7 +1346,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -1368,14 +1357,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -1385,14 +1374,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -1400,7 +1389,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1410,7 +1399,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -1421,7 +1410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -1429,7 +1418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -1439,10 +1428,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -1451,7 +1437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -1459,7 +1445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -1473,7 +1459,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -1481,7 +1466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Council`'s storage queries
@@ -1492,7 +1477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1500,7 +1485,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1512,7 +1497,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
      **/
     costOf: GenericStorageQuery<
-      Rv,
       (arg: H256) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined,
       H256
     >;
@@ -1523,33 +1507,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -1560,7 +1544,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1568,7 +1552,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1579,7 +1563,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1587,33 +1571,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Elections`'s storage queries
@@ -1626,7 +1610,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+    members: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The current reserved runners-up.
@@ -1636,7 +1620,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    runnersUp: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+    runnersUp: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The present candidate list. A current member or runner-up can never enter this vector
@@ -1648,14 +1632,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, bigint]>> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, () => Array<[AccountId32, bigint]>>;
+    candidates: GenericStorageQuery<() => Array<[AccountId32, bigint]>>;
 
     /**
      * The total number of vote rounds that have happened, excluding the upcoming one.
      *
      * @param {Callback<number> =} callback
      **/
-    electionRounds: GenericStorageQuery<Rv, () => number>;
+    electionRounds: GenericStorageQuery<() => number>;
 
     /**
      * Votes and locked stake of a particular voter.
@@ -1665,12 +1649,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletElectionsPhragmenVoter> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
+    voting: GenericStorageQuery<(arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalMembership`'s storage queries
@@ -1681,19 +1665,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1704,28 +1688,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1733,7 +1717,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1750,19 +1734,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1776,7 +1760,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1787,14 +1771,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1804,14 +1788,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1819,19 +1803,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -1846,7 +1830,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: FrameSupportTokensFungibleUnionOfNativeOrWithId) => FixedU128 | undefined,
       FrameSupportTokensFungibleUnionOfNativeOrWithId
     >;
@@ -1854,7 +1837,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1866,7 +1849,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1874,7 +1857,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1902,7 +1885,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1913,7 +1896,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
     contractInfoOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
       AccountId32
     >;
@@ -1927,7 +1909,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1935,7 +1917,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1943,12 +1925,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1959,12 +1941,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ImOnline`'s storage queries
@@ -1985,14 +1967,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    heartbeatAfter: GenericStorageQuery<Rv, () => number>;
+    heartbeatAfter: GenericStorageQuery<() => number>;
 
     /**
      * The current set of keys that may issue a heartbeat.
      *
      * @param {Callback<Array<PalletImOnlineSr25519AppSr25519Public>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<PalletImOnlineSr25519AppSr25519Public>>;
+    keys: GenericStorageQuery<() => Array<PalletImOnlineSr25519AppSr25519Public>>;
 
     /**
      * For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`.
@@ -2000,7 +1982,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    receivedHeartbeats: GenericStorageQuery<Rv, (arg: [number, number]) => boolean | undefined, [number, number]>;
+    receivedHeartbeats: GenericStorageQuery<(arg: [number, number]) => boolean | undefined, [number, number]>;
 
     /**
      * For each session index, we keep a mapping of `ValidatorId<T>` to the
@@ -2009,12 +1991,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number> =} callback
      **/
-    authoredBlocks: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
+    authoredBlocks: GenericStorageQuery<(arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -2025,19 +2007,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -2049,7 +2031,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -2058,7 +2040,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -2066,7 +2047,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -2078,19 +2059,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -2103,12 +2084,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
+    randomMaterial: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -2123,7 +2104,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -2131,7 +2112,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -2140,7 +2121,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -2152,7 +2133,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -2162,7 +2143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -2170,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -2183,7 +2164,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -2197,7 +2178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -2211,12 +2191,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Society`'s storage queries
@@ -2227,28 +2207,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
      **/
-    parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
+    parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
 
     /**
      * Amount of our account balance that is specifically for the next round's bid(s).
      *
      * @param {Callback<bigint> =} callback
      **/
-    pot: GenericStorageQuery<Rv, () => bigint>;
+    pot: GenericStorageQuery<() => bigint>;
 
     /**
      * The first member.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    founder: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The most primary from the most recently approved rank 0 members in the society.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    head: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * A hash of the rules of this society concerning membership. Can only be set once and
@@ -2256,7 +2236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    rules: GenericStorageQuery<Rv, () => H256 | undefined>;
+    rules: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * The current members and their rank. Doesn't include `SuspendedMembers`.
@@ -2264,7 +2244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * Information regarding rank-0 payouts, past and future.
@@ -2272,14 +2252,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyPayoutRecord> =} callback
      **/
-    payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
+    payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
 
     /**
      * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
      *
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, () => number>;
+    memberCount: GenericStorageQuery<() => number>;
 
     /**
      * The current items in `Members` keyed by their unique index. Keys are densely populated
@@ -2288,7 +2268,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The set of suspended members, with their old membership record.
@@ -2296,39 +2276,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    suspendedMembers: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined,
-      AccountId32
-    >;
+    suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * The number of rounds which have passed.
      *
      * @param {Callback<number> =} callback
      **/
-    roundCount: GenericStorageQuery<Rv, () => number>;
+    roundCount: GenericStorageQuery<() => number>;
 
     /**
      * The current bids, stored ordered by the value of the bid.
      *
      * @param {Callback<Array<PalletSocietyBid>> =} callback
      **/
-    bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
+    bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
+    candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
 
     /**
      * The current skeptic.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Double map from Candidate -> Voter -> (Maybe) Vote.
@@ -2337,7 +2313,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     votes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2348,7 +2323,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * At the end of the claim period, this contains the most recently approved members (along with
@@ -2357,21 +2332,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
      **/
-    nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
+    nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
 
     /**
      * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
      *
      * @param {Callback<number> =} callback
      **/
-    challengeRoundCount: GenericStorageQuery<Rv, () => number>;
+    challengeRoundCount: GenericStorageQuery<() => number>;
 
     /**
      * The defending member currently being challenged, along with a running tally of votes.
      *
      * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
      **/
-    defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+    defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
 
     /**
      * Votes for the defender, keyed by challenge round.
@@ -2380,7 +2355,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     defenderVotes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined,
       [number, AccountId32]
     >;
@@ -2388,7 +2362,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -2400,11 +2374,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
-      AccountId32
-    >;
+    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
 
     /**
      * Active recovery attempts.
@@ -2416,7 +2386,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2429,12 +2398,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2446,11 +2415,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -2459,12 +2424,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2475,7 +2440,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2483,7 +2448,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -2491,11 +2456,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2506,12 +2467,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Glutton`'s storage queries
@@ -2525,7 +2486,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    compute: GenericStorageQuery<Rv, () => FixedU64>;
+    compute: GenericStorageQuery<() => FixedU64>;
 
     /**
      * The proportion of the remaining `proof_size` to consume during `on_idle`.
@@ -2535,7 +2496,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    storage: GenericStorageQuery<Rv, () => FixedU64>;
+    storage: GenericStorageQuery<() => FixedU64>;
 
     /**
      * The proportion of the `block length` to consume on each block.
@@ -2545,7 +2506,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    length: GenericStorageQuery<Rv, () => FixedU64>;
+    length: GenericStorageQuery<() => FixedU64>;
 
     /**
      * Storage map used for wasting proof size.
@@ -2560,19 +2521,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedBytes<1024> | undefined> =} callback
      **/
-    trashData: GenericStorageQuery<Rv, (arg: number) => FixedBytes<1024> | undefined, number>;
+    trashData: GenericStorageQuery<(arg: number) => FixedBytes<1024> | undefined, number>;
 
     /**
      * The current number of entries in `TrashData`.
      *
      * @param {Callback<number> =} callback
      **/
-    trashDataCount: GenericStorageQuery<Rv, () => number>;
+    trashDataCount: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -2584,7 +2545,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -2592,19 +2553,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -2617,11 +2578,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -2629,16 +2586,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -2651,7 +2604,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -2659,7 +2611,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2670,7 +2622,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2678,7 +2630,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2686,19 +2638,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tips`'s storage queries
@@ -2712,7 +2664,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletTipsOpenTip | undefined> =} callback
      **/
-    tips: GenericStorageQuery<Rv, (arg: H256) => PalletTipsOpenTip | undefined, H256>;
+    tips: GenericStorageQuery<(arg: H256) => PalletTipsOpenTip | undefined, H256>;
 
     /**
      * Simple preimage lookup from the reason's hash to the original data. Again, has an
@@ -2721,12 +2673,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    reasons: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    reasons: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -2738,7 +2690,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2747,7 +2699,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2761,7 +2712,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2772,7 +2722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2787,12 +2737,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -2804,7 +2754,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2813,7 +2763,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2827,7 +2776,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2838,7 +2786,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2853,12 +2801,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -2869,21 +2817,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -2900,7 +2848,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -2909,12 +2857,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -2925,14 +2873,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -2943,12 +2891,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MmrLeaf`'s storage queries
@@ -2959,7 +2907,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -2968,12 +2916,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Lottery`'s storage queries
@@ -2983,14 +2931,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lotteryIndex: GenericStorageQuery<Rv, () => number>;
+    lotteryIndex: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current lottery.
      *
      * @param {Callback<PalletLotteryLotteryConfig | undefined> =} callback
      **/
-    lottery: GenericStorageQuery<Rv, () => PalletLotteryLotteryConfig | undefined>;
+    lottery: GenericStorageQuery<() => PalletLotteryLotteryConfig | undefined>;
 
     /**
      * Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
@@ -2998,14 +2946,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, Array<[number, number]>]> =} callback
      **/
-    participants: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
+    participants: GenericStorageQuery<(arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
 
     /**
      * Total number of tickets sold.
      *
      * @param {Callback<number> =} callback
      **/
-    ticketsCount: GenericStorageQuery<Rv, () => number>;
+    ticketsCount: GenericStorageQuery<() => number>;
 
     /**
      * Each ticket's owner.
@@ -3016,7 +2964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    tickets: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    tickets: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The calls stored in this pallet to be used in an active lottery if configured
@@ -3024,12 +2972,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    callIndices: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    callIndices: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nis`'s storage queries
@@ -3044,7 +2992,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    queueTotals: GenericStorageQuery<Rv, () => Array<[number, bigint]>>;
+    queueTotals: GenericStorageQuery<() => Array<[number, bigint]>>;
 
     /**
      * The queues of bids. Indexed by duration (in `Period`s).
@@ -3052,14 +3000,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletNisBid>> =} callback
      **/
-    queues: GenericStorageQuery<Rv, (arg: number) => Array<PalletNisBid>, number>;
+    queues: GenericStorageQuery<(arg: number) => Array<PalletNisBid>, number>;
 
     /**
      * Summary information over the general state.
      *
      * @param {Callback<PalletNisSummaryRecord> =} callback
      **/
-    summary: GenericStorageQuery<Rv, () => PalletNisSummaryRecord>;
+    summary: GenericStorageQuery<() => PalletNisSummaryRecord>;
 
     /**
      * The currently outstanding receipts, indexed according to the order of creation.
@@ -3067,12 +3015,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNisReceiptRecord | undefined> =} callback
      **/
-    receipts: GenericStorageQuery<Rv, (arg: number) => PalletNisReceiptRecord | undefined, number>;
+    receipts: GenericStorageQuery<(arg: number) => PalletNisReceiptRecord | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -3084,7 +3032,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -3092,7 +3040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -3102,7 +3050,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -3114,7 +3061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -3122,7 +3069,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -3130,7 +3077,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -3139,7 +3086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -3151,7 +3097,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -3163,7 +3108,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -3174,12 +3118,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -3191,7 +3135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -3199,7 +3143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -3209,7 +3153,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -3221,11 +3164,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -3235,7 +3174,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -3246,7 +3184,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -3254,7 +3192,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -3263,7 +3201,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -3275,7 +3212,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -3289,7 +3225,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -3300,7 +3235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -3308,7 +3243,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -3316,11 +3251,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -3328,7 +3259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -3336,16 +3267,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NftFractionalization`'s storage queries
@@ -3358,7 +3285,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
      **/
     nftToAsset: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftFractionalizationDetails | undefined,
       [number, number]
     >;
@@ -3366,7 +3292,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Salary`'s storage queries
@@ -3377,7 +3303,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSalaryStatusType | undefined> =} callback
      **/
-    status: GenericStorageQuery<Rv, () => PalletSalaryStatusType | undefined>;
+    status: GenericStorageQuery<() => PalletSalaryStatusType | undefined>;
 
     /**
      * The status of a claimant.
@@ -3385,12 +3311,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSalaryClaimantStatus | undefined> =} callback
      **/
-    claimant: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
+    claimant: GenericStorageQuery<(arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoreFellowship`'s storage queries
@@ -3401,7 +3327,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletCoreFellowshipParamsType> =} callback
      **/
-    params: GenericStorageQuery<Rv, () => PalletCoreFellowshipParamsType>;
+    params: GenericStorageQuery<() => PalletCoreFellowshipParamsType>;
 
     /**
      * The status of a claimant.
@@ -3409,11 +3335,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletCoreFellowshipMemberStatus | undefined> =} callback
      **/
-    member: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined,
-      AccountId32
-    >;
+    member: GenericStorageQuery<(arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined, AccountId32>;
 
     /**
      * Some evidence together with the desired outcome for which it was presented.
@@ -3422,7 +3344,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletCoreFellowshipWish, Bytes] | undefined> =} callback
      **/
     memberEvidence: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined,
       AccountId32
     >;
@@ -3430,7 +3351,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionStorage`'s storage queries
@@ -3443,7 +3364,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo> | undefined> =} callback
      **/
     transactions: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined,
       number
     >;
@@ -3454,21 +3374,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    chunkCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    chunkCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Storage fee per byte.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    byteFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+    byteFee: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Storage fee per transaction.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    entryFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+    entryFee: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
@@ -3476,25 +3396,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    storagePeriod: GenericStorageQuery<Rv, () => number>;
+    storagePeriod: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo>> =} callback
      **/
-    blockTransactions: GenericStorageQuery<Rv, () => Array<PalletTransactionStorageTransactionInfo>>;
+    blockTransactions: GenericStorageQuery<() => Array<PalletTransactionStorageTransactionInfo>>;
 
     /**
      * Was the proof checked in this block?
      *
      * @param {Callback<boolean> =} callback
      **/
-    proofChecked: GenericStorageQuery<Rv, () => boolean>;
+    proofChecked: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -3508,14 +3428,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -3525,12 +3445,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -3544,7 +3464,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -3553,7 +3473,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -3562,12 +3482,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -3579,7 +3499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -3588,7 +3508,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -3596,7 +3516,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -3605,7 +3525,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -3618,7 +3537,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -3630,7 +3549,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -3638,12 +3557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -3654,7 +3573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3662,7 +3581,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -3673,7 +3592,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3681,7 +3600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -3694,12 +3613,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -3713,7 +3632,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -3726,12 +3644,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -3742,12 +3660,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AllianceMotion`'s storage queries
@@ -3758,7 +3676,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -3766,7 +3684,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -3777,7 +3695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -3785,33 +3703,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Alliance`'s storage queries
@@ -3823,14 +3741,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAllianceCid | undefined> =} callback
      **/
-    rule: GenericStorageQuery<Rv, () => PalletAllianceCid | undefined>;
+    rule: GenericStorageQuery<() => PalletAllianceCid | undefined>;
 
     /**
      * The current IPFS CIDs of any announcements.
      *
      * @param {Callback<Array<PalletAllianceCid>> =} callback
      **/
-    announcements: GenericStorageQuery<Rv, () => Array<PalletAllianceCid>>;
+    announcements: GenericStorageQuery<() => Array<PalletAllianceCid>>;
 
     /**
      * Maps members to their candidacy deposit.
@@ -3838,7 +3756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    depositOf: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Maps member type to members of each type.
@@ -3846,7 +3764,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {PalletAllianceMemberRole} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
+    members: GenericStorageQuery<(arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
 
     /**
      * A set of members who gave a retirement notice. They can retire after the end of retirement
@@ -3855,7 +3773,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    retiringMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    retiringMembers: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The current list of accounts deemed unscrupulous. These accounts non grata cannot submit
@@ -3863,19 +3781,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    unscrupulousAccounts: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    unscrupulousAccounts: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current list of websites deemed unscrupulous.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    unscrupulousWebsites: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    unscrupulousWebsites: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -3890,14 +3808,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -3910,7 +3828,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -3918,7 +3836,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -3926,7 +3844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -3934,7 +3852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -3943,7 +3861,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -3954,7 +3872,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -3964,7 +3881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -3972,14 +3889,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -3988,14 +3905,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -4004,14 +3921,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -4019,21 +3936,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -4044,14 +3961,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -4059,16 +3976,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RankedPolls`'s storage queries
@@ -4079,7 +3992,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -4087,7 +4000,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -4098,7 +4011,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -4106,7 +4019,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -4119,12 +4032,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RankedCollective`'s storage queries
@@ -4137,7 +4050,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    memberCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The current members of the collective.
@@ -4145,11 +4058,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined,
-      AccountId32
-    >;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
 
     /**
      * The index of each ranks's member into the group of members who have at least that rank.
@@ -4157,7 +4066,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
+    idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
 
     /**
      * The members in the collective by index. All indices in the range `0..MemberCount` will
@@ -4166,7 +4075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
+    indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined, [number, number]>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -4175,7 +4084,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
      **/
     voting: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined,
       [number, AccountId32]
     >;
@@ -4185,12 +4093,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -4204,7 +4112,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (
         arg: [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId],
       ) => PalletAssetConversionPoolInfo | undefined,
@@ -4217,12 +4124,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -4235,7 +4142,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -4245,14 +4152,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -4266,12 +4173,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -4283,14 +4190,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
-    bookStateFor: GenericStorageQuery<Rv, (arg: number) => PalletMessageQueueBookState, number>;
+    bookStateFor: GenericStorageQuery<(arg: number) => PalletMessageQueueBookState, number>;
 
     /**
      * The origin at which we should begin servicing.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => number | undefined>;
+    serviceHead: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -4298,12 +4205,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
-    pages: GenericStorageQuery<Rv, (arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
+    pages: GenericStorageQuery<(arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Pov`'s storage queries
@@ -4313,40 +4220,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value: GenericStorageQuery<Rv, () => number | undefined>;
+    value: GenericStorageQuery<() => number | undefined>;
 
     /**
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value2: GenericStorageQuery<Rv, () => number | undefined>;
+    value2: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A value without a MEL bound.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    unboundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    unboundedValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * A value with a MEL bound of 32 byte.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    boundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    boundedValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * 4MiB value.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    largeValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue2: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    largeValue2: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * A map with a maximum of 1M entries.
@@ -4354,7 +4261,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map1M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    map1M: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * A map with a maximum of 16M entries.
@@ -4362,40 +4269,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map16M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    map16M: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      *
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    doubleMap1M: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+    doubleMap1M: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMap: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap2: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMap2: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMapTwox: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMapTwox: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -4407,12 +4314,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -4427,7 +4334,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
+    enteredUntil: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -4438,12 +4345,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
+    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -4456,7 +4363,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -4467,12 +4374,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broker`'s storage queries
@@ -4483,35 +4390,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletBrokerConfigRecord | undefined> =} callback
      **/
-    configuration: GenericStorageQuery<Rv, () => PalletBrokerConfigRecord | undefined>;
+    configuration: GenericStorageQuery<() => PalletBrokerConfigRecord | undefined>;
 
     /**
      * The Polkadot Core reservations (generally tasked with the maintenance of System Chains).
      *
      * @param {Callback<Array<Array<PalletBrokerScheduleItem>>> =} callback
      **/
-    reservations: GenericStorageQuery<Rv, () => Array<Array<PalletBrokerScheduleItem>>>;
+    reservations: GenericStorageQuery<() => Array<Array<PalletBrokerScheduleItem>>>;
 
     /**
      * The Polkadot Core legacy leases.
      *
      * @param {Callback<Array<PalletBrokerLeaseRecordItem>> =} callback
      **/
-    leases: GenericStorageQuery<Rv, () => Array<PalletBrokerLeaseRecordItem>>;
+    leases: GenericStorageQuery<() => Array<PalletBrokerLeaseRecordItem>>;
 
     /**
      * The current status of miscellaneous subsystems of this pallet.
      *
      * @param {Callback<PalletBrokerStatusRecord | undefined> =} callback
      **/
-    status: GenericStorageQuery<Rv, () => PalletBrokerStatusRecord | undefined>;
+    status: GenericStorageQuery<() => PalletBrokerStatusRecord | undefined>;
 
     /**
      * The details of the current sale, including its properties and status.
      *
      * @param {Callback<PalletBrokerSaleInfoRecord | undefined> =} callback
      **/
-    saleInfo: GenericStorageQuery<Rv, () => PalletBrokerSaleInfoRecord | undefined>;
+    saleInfo: GenericStorageQuery<() => PalletBrokerSaleInfoRecord | undefined>;
 
     /**
      * Records of potential renewals.
@@ -4522,7 +4429,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerPotentialRenewalRecord | undefined> =} callback
      **/
     potentialRenewals: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerPotentialRenewalId) => PalletBrokerPotentialRenewalRecord | undefined,
       PalletBrokerPotentialRenewalId
     >;
@@ -4534,7 +4440,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerRegionRecord | undefined> =} callback
      **/
     regions: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined,
       PalletBrokerRegionId
     >;
@@ -4546,7 +4451,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletBrokerScheduleItem> | undefined> =} callback
      **/
     workplan: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined,
       [number, number]
     >;
@@ -4557,7 +4461,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletBrokerScheduleItem>> =} callback
      **/
-    workload: GenericStorageQuery<Rv, (arg: number) => Array<PalletBrokerScheduleItem>, number>;
+    workload: GenericStorageQuery<(arg: number) => Array<PalletBrokerScheduleItem>, number>;
 
     /**
      * Record of a single contribution to the Instantaneous Coretime Pool.
@@ -4566,7 +4470,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerContributionRecord | undefined> =} callback
      **/
     instaPoolContribution: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined,
       PalletBrokerRegionId
     >;
@@ -4577,7 +4480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBrokerPoolIoRecord> =} callback
      **/
-    instaPoolIo: GenericStorageQuery<Rv, (arg: number) => PalletBrokerPoolIoRecord, number>;
+    instaPoolIo: GenericStorageQuery<(arg: number) => PalletBrokerPoolIoRecord, number>;
 
     /**
      * Total InstaPool rewards for each Timeslice and the number of core parts which contributed.
@@ -4585,14 +4488,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBrokerInstaPoolHistoryRecord | undefined> =} callback
      **/
-    instaPoolHistory: GenericStorageQuery<Rv, (arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
+    instaPoolHistory: GenericStorageQuery<(arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
 
     /**
      * Received core count change from the relay chain.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    coreCountInbox: GenericStorageQuery<Rv, () => number | undefined>;
+    coreCountInbox: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Keeping track of cores which have auto-renewal enabled.
@@ -4601,19 +4504,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletBrokerAutoRenewalRecord>> =} callback
      **/
-    autoRenewals: GenericStorageQuery<Rv, () => Array<PalletBrokerAutoRenewalRecord>>;
+    autoRenewals: GenericStorageQuery<() => Array<PalletBrokerAutoRenewalRecord>>;
 
     /**
      * Received revenue info from the relay chain.
      *
      * @param {Callback<PalletBrokerOnDemandRevenueRecord | undefined> =} callback
      **/
-    revenueInbox: GenericStorageQuery<Rv, () => PalletBrokerOnDemandRevenueRecord | undefined>;
+    revenueInbox: GenericStorageQuery<() => PalletBrokerOnDemandRevenueRecord | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TasksExample`'s storage queries
@@ -4624,7 +4527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => [number, number]>;
+    total: GenericStorageQuery<() => [number, number]>;
 
     /**
      * Numbers to be added into the total.
@@ -4632,12 +4535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    numbers: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    numbers: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mixnet`'s storage queries
@@ -4649,14 +4552,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * Block in which the current session started.
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    currentSessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * Authority list for the next session.
@@ -4664,7 +4567,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpMixnetAppPublic | undefined> =} callback
      **/
-    nextAuthorityIds: GenericStorageQuery<Rv, (arg: number) => SpMixnetAppPublic | undefined, number>;
+    nextAuthorityIds: GenericStorageQuery<(arg: number) => SpMixnetAppPublic | undefined, number>;
 
     /**
      * Mixnode sets by session index. Only the mixnode sets for the previous, current, and next
@@ -4677,16 +4580,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletMixnetBoundedMixnode | undefined> =} callback
      **/
-    mixnodes: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletMixnetBoundedMixnode | undefined,
-      [number, number]
-    >;
+    mixnodes: GenericStorageQuery<(arg: [number, number]) => PalletMixnetBoundedMixnode | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -4699,7 +4598,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<KitchensinkRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: KitchensinkRuntimeRuntimeParametersKey) => KitchensinkRuntimeRuntimeParametersValue | undefined,
       KitchensinkRuntimeRuntimeParametersKey
     >;
@@ -4707,7 +4605,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PalletExampleMbms`'s storage queries
@@ -4719,12 +4617,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    myMap: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    myMap: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -4736,7 +4634,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -4744,7 +4642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
 
     /**
      * The code associated with a given account.
@@ -4752,7 +4650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageContractInfo | undefined> =} callback
      **/
-    contractInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
+    contractInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -4760,7 +4658,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -4771,7 +4669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -4779,7 +4677,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -4792,12 +4690,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -4813,7 +4711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -4823,7 +4720,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -4831,23 +4728,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRewards`'s storage queries
@@ -4860,7 +4753,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetRewardsPoolStakerInfo | undefined> =} callback
      **/
     poolStakers: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetRewardsPoolStakerInfo | undefined,
       [number, AccountId32]
     >;
@@ -4871,7 +4763,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRewardsPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
 
     /**
      * The cost associated with storing pool information on-chain which was incurred by the pool
@@ -4883,7 +4775,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
      **/
     poolCost: GenericStorageQuery<
-      Rv,
       (arg: number) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined,
       number
     >;
@@ -4895,12 +4786,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextPoolId: GenericStorageQuery<Rv, () => number>;
+    nextPoolId: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetsFreezer`'s storage queries
@@ -4913,7 +4804,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       [number, AccountId32]
     >;
@@ -4924,15 +4814,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    frozenBalances: GenericStorageQuery<
-      Rv,
-      (arg: [number, AccountId32Like]) => bigint | undefined,
-      [number, AccountId32]
-    >;
+    frozenBalances: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/substrate/runtime.d.ts b/packages/chaintypes/src/substrate/runtime.d.ts
index a37f429e..fb2f7e8d 100644
--- a/packages/chaintypes/src/substrate/runtime.d.ts
+++ b/packages/chaintypes/src/substrate/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -77,7 +77,7 @@ import type {
   SpCoreCryptoKeyTypeId,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -87,7 +87,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -95,7 +95,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -103,12 +103,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -119,7 +119,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -130,7 +130,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -139,12 +139,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -158,7 +158,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -168,7 +167,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -184,7 +183,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -195,7 +193,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -204,7 +202,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -216,14 +213,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -246,7 +242,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -259,7 +254,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ValidateStatement - 0xbe9fb0c91a8046cf
@@ -273,7 +268,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpStatementStoreStatement} statement
      **/
     validateStatement: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpStatementStoreRuntimeApiStatementSource,
         statement: SpStatementStoreStatement,
@@ -283,7 +277,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -295,12 +289,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -316,7 +310,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -333,7 +327,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -358,7 +351,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -367,12 +359,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -384,7 +376,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -393,7 +385,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -402,7 +394,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -410,7 +402,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -421,7 +413,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -436,7 +428,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -450,7 +442,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -458,7 +450,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -466,7 +458,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -474,12 +466,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -491,7 +483,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -500,7 +492,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -509,12 +501,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
@@ -525,21 +517,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -547,7 +539,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -567,7 +559,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -589,7 +580,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -599,7 +589,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -610,12 +600,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -627,12 +617,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetsApi - 0x8453b50b22293977
@@ -644,12 +634,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AssetsApi_account_balances
      * @param {AccountId32Like} account
      **/
-    accountBalances: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<Array<[number, bigint]>>>;
+    accountBalances: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<Array<[number, bigint]>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ContractsApi - 0x68b66ba122c93fa7
@@ -669,7 +659,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: AccountId32Like,
@@ -695,7 +684,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -719,7 +707,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -740,7 +727,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: AccountId32Like,
         key: BytesLike,
@@ -750,7 +736,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ReviveApi - 0x8c403e5c4a9fd442
@@ -761,7 +747,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_gas_limit
      **/
-    blockGasLimit: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    blockGasLimit: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the free balance of the given `[H160]` address, using EVM decimals.
@@ -769,14 +755,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_balance
      * @param {H160} address
      **/
-    balance: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<U256>>;
+    balance: GenericRuntimeApiMethod<(address: H160) => Promise<U256>>;
 
     /**
      * Returns the gas price.
      *
      * @callname: ReviveApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the nonce of the given `[H160]` address.
@@ -784,7 +770,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_nonce
      * @param {H160} address
      **/
-    nonce: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number>>;
+    nonce: GenericRuntimeApiMethod<(address: H160) => Promise<number>>;
 
     /**
      * Perform a call from a specified account to a given contract.
@@ -800,7 +786,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: H160,
@@ -826,7 +811,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -847,7 +831,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiRpcTypesGenGenericTransaction} tx
      **/
     ethTransact: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
       ) => Promise<Result<PalletRevivePrimitivesEthTransactInfo, PalletRevivePrimitivesEthTransactError>>
@@ -864,7 +847,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} storage_deposit_limit
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -884,7 +866,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32>} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: H160,
         key: FixedBytes<32>,
@@ -904,7 +885,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -925,7 +905,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceTx: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         txIndex: number,
@@ -943,7 +922,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceCall: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -953,7 +931,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -966,7 +944,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -977,7 +954,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -986,19 +962,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetConversionApi - 0x8a8047a53a8277ec
@@ -1017,7 +993,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceTokensForExactTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -1039,7 +1014,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceExactTokensForTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -1056,7 +1030,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} asset2
      **/
     getReserves: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -1066,7 +1039,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -1080,7 +1053,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1092,7 +1064,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1102,7 +1073,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -1110,12 +1081,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NftsApi - 0x899a250cbe84f250
@@ -1127,14 +1098,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} collection
      * @param {number} item
      **/
-    owner: GenericRuntimeApiMethod<Rv, (collection: number, item: number) => Promise<AccountId32 | undefined>>;
+    owner: GenericRuntimeApiMethod<(collection: number, item: number) => Promise<AccountId32 | undefined>>;
 
     /**
      *
      * @callname: NftsApi_collection_owner
      * @param {number} collection
      **/
-    collectionOwner: GenericRuntimeApiMethod<Rv, (collection: number) => Promise<AccountId32 | undefined>>;
+    collectionOwner: GenericRuntimeApiMethod<(collection: number) => Promise<AccountId32 | undefined>>;
 
     /**
      *
@@ -1144,7 +1115,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     attribute: GenericRuntimeApiMethod<
-      Rv,
       (collection: number, item: number, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -1157,7 +1127,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     customAttribute: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like, collection: number, item: number, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -1169,7 +1138,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     systemAttribute: GenericRuntimeApiMethod<
-      Rv,
       (collection: number, item: number | undefined, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -1179,15 +1147,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} collection
      * @param {BytesLike} key
      **/
-    collectionAttribute: GenericRuntimeApiMethod<
-      Rv,
-      (collection: number, key: BytesLike) => Promise<Bytes | undefined>
-    >;
+    collectionAttribute: GenericRuntimeApiMethod<(collection: number, key: BytesLike) => Promise<Bytes | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyApi - 0x49eaaf1b548a0cb0
@@ -1198,14 +1163,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyApi_beefy_genesis
      **/
-    beefyGenesis: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    beefyGenesis: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Return the current active BEEFY validator set
      *
      * @callname: BeefyApi_validator_set
      **/
-    validatorSet: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyValidatorSet | undefined>>;
+    validatorSet: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyValidatorSet | undefined>>;
 
     /**
      * Submits an unsigned extrinsic to report a double voting equivocation. The caller
@@ -1222,7 +1187,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportDoubleVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -1244,7 +1208,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportForkVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProofOpaqueValue,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -1266,7 +1229,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportFutureBlockVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -1291,7 +1253,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBeefyEcdsaCryptoPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusBeefyEcdsaCryptoPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -1304,14 +1265,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateAncestryProof: GenericRuntimeApiMethod<
-      Rv,
       (prevBlockNumber: number, bestKnownBlockNumber?: number | undefined) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MmrApi - 0x91d5df18b0d2cf58
@@ -1322,14 +1282,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MmrApi_mmr_root
      **/
-    mmrRoot: GenericRuntimeApiMethod<Rv, () => Promise<Result<H256, SpMmrPrimitivesError>>>;
+    mmrRoot: GenericRuntimeApiMethod<() => Promise<Result<H256, SpMmrPrimitivesError>>>;
 
     /**
      * Return the number of MMR blocks in the chain.
      *
      * @callname: MmrApi_mmr_leaf_count
      **/
-    mmrLeafCount: GenericRuntimeApiMethod<Rv, () => Promise<Result<bigint, SpMmrPrimitivesError>>>;
+    mmrLeafCount: GenericRuntimeApiMethod<() => Promise<Result<bigint, SpMmrPrimitivesError>>>;
 
     /**
      * Generate MMR proof for a series of block numbers. If `best_known_block_number = Some(n)`,
@@ -1340,7 +1300,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateProof: GenericRuntimeApiMethod<
-      Rv,
       (
         blockNumbers: Array<number>,
         bestKnownBlockNumber?: number | undefined,
@@ -1359,7 +1318,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProof: GenericRuntimeApiMethod<
-      Rv,
       (
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
         proof: SpMmrPrimitivesLeafProof,
@@ -1381,7 +1339,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProofStateless: GenericRuntimeApiMethod<
-      Rv,
       (
         root: H256,
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
@@ -1392,7 +1349,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MixnetApi - 0x6fd7c327202e4a8d
@@ -1403,21 +1360,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MixnetApi_session_status
      **/
-    sessionStatus: GenericRuntimeApiMethod<Rv, () => Promise<SpMixnetSessionStatus>>;
+    sessionStatus: GenericRuntimeApiMethod<() => Promise<SpMixnetSessionStatus>>;
 
     /**
      * Get the mixnode set for the previous session.
      *
      * @callname: MixnetApi_prev_mixnodes
      **/
-    prevMixnodes: GenericRuntimeApiMethod<Rv, () => Promise<Result<Array<SpMixnetMixnode>, SpMixnetMixnodesErr>>>;
+    prevMixnodes: GenericRuntimeApiMethod<() => Promise<Result<Array<SpMixnetMixnode>, SpMixnetMixnodesErr>>>;
 
     /**
      * Get the mixnode set for the current session.
      *
      * @callname: MixnetApi_current_mixnodes
      **/
-    currentMixnodes: GenericRuntimeApiMethod<Rv, () => Promise<Result<Array<SpMixnetMixnode>, SpMixnetMixnodesErr>>>;
+    currentMixnodes: GenericRuntimeApiMethod<() => Promise<Result<Array<SpMixnetMixnode>, SpMixnetMixnodesErr>>>;
 
     /**
      * Try to register a mixnode for the next session.
@@ -1440,12 +1397,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session_index
      * @param {SpMixnetMixnode} mixnode
      **/
-    maybeRegister: GenericRuntimeApiMethod<Rv, (sessionIndex: number, mixnode: SpMixnetMixnode) => Promise<boolean>>;
+    maybeRegister: GenericRuntimeApiMethod<(sessionIndex: number, mixnode: SpMixnetMixnode) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -1463,7 +1420,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -1474,14 +1431,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetRewards - 0x65f855d6e093c2f1
@@ -1494,12 +1450,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AssetRewards_pool_creation_cost
      **/
-    poolCreationCost: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    poolCreationCost: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1520,7 +1476,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1541,7 +1497,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1551,11 +1507,11 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/substrate/tx.d.ts b/packages/chaintypes/src/substrate/tx.d.ts
index b289d96b..f44aad10 100644
--- a/packages/chaintypes/src/substrate/tx.d.ts
+++ b/packages/chaintypes/src/substrate/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -115,16 +113,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = KitchensinkRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<KitchensinkRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -137,16 +137,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -156,16 +155,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -175,16 +173,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -197,16 +194,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -216,16 +212,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -235,16 +230,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -258,19 +252,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -280,16 +273,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -302,16 +294,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -328,16 +319,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -355,23 +345,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -400,16 +389,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<KitchensinkRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<KitchensinkRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<KitchensinkRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -432,19 +420,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -466,16 +453,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<KitchensinkRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<KitchensinkRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<KitchensinkRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -491,19 +477,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: KitchensinkRuntimeOriginCaller,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: KitchensinkRuntimeOriginCaller; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -525,16 +510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<KitchensinkRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<KitchensinkRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<KitchensinkRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -550,19 +534,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: KitchensinkRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: KitchensinkRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -595,19 +578,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: KitchensinkRuntimeRuntimeCallLike,
         fallback: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: KitchensinkRuntimeRuntimeCallLike; fallback: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -622,26 +604,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: KitchensinkRuntimeOriginCaller,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: KitchensinkRuntimeOriginCaller; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -657,19 +638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -687,19 +667,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -712,23 +691,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -758,23 +736,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -797,16 +774,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -828,19 +804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -861,16 +836,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -894,20 +868,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -928,16 +901,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -956,23 +928,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -991,19 +962,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1016,20 +986,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1045,19 +1014,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1082,19 +1050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1107,19 +1074,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1136,16 +1102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1158,19 +1123,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1185,19 +1149,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1214,26 +1177,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -1259,12 +1221,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -1274,7 +1234,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1288,16 +1249,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1314,16 +1274,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1341,16 +1300,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1364,26 +1322,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeMaxTargets
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       (
         maybeMaxVoters: number | undefined,
         maybeMaxTargets: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
             params: { maybeMaxVoters: number | undefined; maybeMaxTargets: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -1411,19 +1368,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1446,16 +1402,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1483,16 +1438,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1524,16 +1478,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1547,16 +1500,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1575,16 +1527,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1602,15 +1553,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1631,16 +1581,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1662,15 +1611,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1685,16 +1633,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1710,16 +1657,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1735,16 +1681,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1765,15 +1710,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1795,15 +1739,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1815,16 +1758,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1842,19 +1784,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1871,15 +1812,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1894,19 +1834,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1929,19 +1868,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1957,16 +1895,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1994,19 +1931,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2026,16 +1962,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2067,7 +2002,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -2077,7 +2011,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2092,7 +2025,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2127,16 +2061,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2148,16 +2081,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2170,16 +2102,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2207,20 +2138,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2235,16 +2165,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2260,16 +2189,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2292,14 +2220,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2311,7 +2237,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2327,16 +2254,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2368,27 +2294,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} slashFraction
      **/
     manualSlash: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         slashFraction: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ManualSlash';
             params: { validatorStash: AccountId32Like; era: number; slashFraction: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2409,19 +2334,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: KitchensinkRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: KitchensinkRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2441,22 +2365,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Democracy`'s transaction calls
@@ -2477,19 +2400,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     propose: GenericTxCall<
-      Rv,
       (
         proposal: FrameSupportPreimagesBounded,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Propose';
             params: { proposal: FrameSupportPreimagesBounded; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2504,16 +2426,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposal
      **/
     second: GenericTxCall<
-      Rv,
       (proposal: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Second';
             params: { proposal: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2530,19 +2451,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletDemocracyVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         refIndex: number,
         vote: PalletDemocracyVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Vote';
             params: { refIndex: number; vote: PalletDemocracyVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2559,16 +2479,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     emergencyCancel: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'EmergencyCancel';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2583,16 +2502,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalPropose: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalPropose';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2612,16 +2530,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeMajority: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeMajority';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2641,16 +2558,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportPreimagesBounded} proposal
      **/
     externalProposeDefault: GenericTxCall<
-      Rv,
       (proposal: FrameSupportPreimagesBounded) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ExternalProposeDefault';
             params: { proposal: FrameSupportPreimagesBounded };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2677,20 +2593,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     fastTrack: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         votingPeriod: number,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'FastTrack';
             params: { proposalHash: H256; votingPeriod: number; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2708,16 +2623,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     vetoExternal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'VetoExternal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2733,16 +2647,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} refIndex
      **/
     cancelReferendum: GenericTxCall<
-      Rv,
       (refIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelReferendum';
             params: { refIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2773,20 +2686,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         to: MultiAddressLike,
         conviction: PalletDemocracyConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Delegate';
             params: { to: MultiAddressLike; conviction: PalletDemocracyConviction; balance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2806,15 +2718,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     undelegate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Undelegate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2827,15 +2738,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPublicProposals: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'ClearPublicProposals';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2851,16 +2761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Unlock';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2896,16 +2805,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveVote';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2930,19 +2838,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2967,19 +2874,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeRefIndex
      **/
     blacklist: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         maybeRefIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'Blacklist';
             params: { proposalHash: H256; maybeRefIndex: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2995,16 +2901,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} propIndex
      **/
     cancelProposal: GenericTxCall<
-      Rv,
       (propIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'CancelProposal';
             params: { propIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3029,26 +2934,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         owner: PalletDemocracyMetadataOwner,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Democracy';
           palletCall: {
             name: 'SetMetadata';
             params: { owner: PalletDemocracyMetadataOwner; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Council`'s transaction calls
@@ -3085,20 +2989,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3117,19 +3020,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Execute';
             params: { proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3154,20 +3056,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3187,20 +3088,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3219,16 +3119,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3264,14 +3163,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
@@ -3283,7 +3180,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3299,16 +3197,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3326,23 +3223,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Council';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalCommittee`'s transaction calls
@@ -3379,20 +3275,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3411,19 +3306,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Execute';
             params: { proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3448,20 +3342,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3481,20 +3374,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3513,16 +3405,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3558,14 +3449,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
@@ -3577,7 +3466,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3593,16 +3483,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3620,23 +3509,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalCommittee';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Elections`'s transaction calls
@@ -3667,19 +3555,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     vote: GenericTxCall<
-      Rv,
       (
         votes: Array<AccountId32Like>,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'Vote';
             params: { votes: Array<AccountId32Like>; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3692,15 +3579,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeVoter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'RemoveVoter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3724,16 +3610,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} candidateCount
      **/
     submitCandidacy: GenericTxCall<
-      Rv,
       (candidateCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'SubmitCandidacy';
             params: { candidateCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3762,16 +3647,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionsPhragmenRenouncing} renouncing
      **/
     renounceCandidacy: GenericTxCall<
-      Rv,
       (renouncing: PalletElectionsPhragmenRenouncing) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'RenounceCandidacy';
             params: { renouncing: PalletElectionsPhragmenRenouncing };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3798,20 +3682,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} rerunElection
      **/
     removeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         slashBond: boolean,
         rerunElection: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike; slashBond: boolean; rerunElection: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3830,26 +3713,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numDefunct
      **/
     cleanDefunctVoters: GenericTxCall<
-      Rv,
       (
         numVoters: number,
         numDefunct: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Elections';
           palletCall: {
             name: 'CleanDefunctVoters';
             params: { numVoters: number; numDefunct: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TechnicalMembership`'s transaction calls
@@ -3863,16 +3745,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3884,16 +3765,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     removeMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3908,19 +3788,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} add
      **/
     swapMember: GenericTxCall<
-      Rv,
       (
         remove: MultiAddressLike,
         add: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'SwapMember';
             params: { remove: MultiAddressLike; add: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3933,16 +3812,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} members
      **/
     resetMembers: GenericTxCall<
-      Rv,
       (members: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'ResetMembers';
             params: { members: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3956,16 +3834,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     changeKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'ChangeKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3977,16 +3854,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     setPrime: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'SetPrime';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3997,22 +3873,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearPrime: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TechnicalMembership';
           palletCall: {
             name: 'ClearPrime';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -4028,19 +3903,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4059,19 +3933,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4093,26 +3966,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -4141,19 +4013,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4183,16 +4054,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4230,14 +4100,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         amount: bigint,
         beneficiary: MultiAddressLike,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -4249,7 +4117,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4277,16 +4146,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4314,16 +4182,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4348,23 +4215,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -4380,19 +4246,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4406,19 +4271,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4431,23 +4295,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: FrameSupportTokensFungibleUnionOfNativeOrWithId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Contracts`'s transaction calls
@@ -4463,7 +4326,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     callOldWeight: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -4471,7 +4333,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4484,7 +4345,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4499,7 +4361,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCodeOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -4508,7 +4369,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4522,7 +4382,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4537,7 +4398,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateOldWeight: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: bigint,
@@ -4546,7 +4406,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4560,7 +4419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4595,13 +4455,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletContractsWasmDeterminism} determinism
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint | undefined,
         determinism: PalletContractsWasmDeterminism,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4612,7 +4470,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               determinism: PalletContractsWasmDeterminism;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4625,16 +4484,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4654,19 +4512,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'SetCode';
             params: { dest: MultiAddressLike; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4695,7 +4552,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
@@ -4703,7 +4559,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint | undefined,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4716,7 +4571,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4755,7 +4611,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -4764,7 +4619,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4778,7 +4632,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4797,7 +4652,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -4806,7 +4660,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
@@ -4820,7 +4673,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4833,23 +4687,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     migrate: GenericTxCall<
-      Rv,
       (weightLimit: SpWeightsWeightV2Weight) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Contracts';
           palletCall: {
             name: 'Migrate';
             params: { weightLimit: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -4861,16 +4714,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4885,19 +4737,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: KitchensinkRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: KitchensinkRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4908,16 +4759,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4931,19 +4781,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4954,22 +4803,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ImOnline`'s transaction calls
@@ -4984,26 +4832,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletImOnlineSr25519AppSr25519Signature} signature
      **/
     heartbeat: GenericTxCall<
-      Rv,
       (
         heartbeat: PalletImOnlineHeartbeat,
         signature: PalletImOnlineSr25519AppSr25519Signature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ImOnline';
           palletCall: {
             name: 'Heartbeat';
             params: { heartbeat: PalletImOnlineHeartbeat; signature: PalletImOnlineSr25519AppSr25519Signature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -5021,16 +4868,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5049,16 +4895,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5076,16 +4921,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5101,15 +4945,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5135,19 +4978,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5166,16 +5008,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5192,19 +5033,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5221,19 +5061,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5250,19 +5089,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5289,21 +5127,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5324,16 +5161,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5350,19 +5186,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5376,19 +5211,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5404,16 +5238,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5431,15 +5264,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5455,20 +5287,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5479,19 +5310,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5516,14 +5346,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -5535,7 +5363,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5546,16 +5375,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5567,16 +5395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5586,16 +5413,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5607,16 +5433,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5627,16 +5452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5647,23 +5471,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Society`'s transaction calls
@@ -5683,16 +5506,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     bid: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Bid';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5707,15 +5529,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unbid: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unbid';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5743,20 +5564,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} tip
      **/
     vouch: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         value: bigint,
         tip: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vouch';
             params: { who: MultiAddressLike; value: bigint; tip: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5771,15 +5591,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unvouch: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Unvouch';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5797,19 +5616,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         candidate: MultiAddressLike,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Vote';
             params: { candidate: MultiAddressLike; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5825,16 +5643,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     defenderVote: GenericTxCall<
-      Rv,
       (approve: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DefenderVote';
             params: { approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5852,15 +5669,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     payout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Payout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5871,16 +5687,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     waiveRepay: GenericTxCall<
-      Rv,
       (amount: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'WaiveRepay';
             params: { amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5911,7 +5726,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} rules
      **/
     foundSociety: GenericTxCall<
-      Rv,
       (
         founder: MultiAddressLike,
         maxMembers: number,
@@ -5920,7 +5734,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         candidateDeposit: bigint,
         rules: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
@@ -5934,7 +5747,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               rules: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5947,15 +5761,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     dissolve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'Dissolve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5979,19 +5792,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} forgive
      **/
     judgeSuspendedMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         forgive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'JudgeSuspendedMember';
             params: { who: MultiAddressLike; forgive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6015,21 +5827,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} candidateDeposit
      **/
     setParameters: GenericTxCall<
-      Rv,
       (
         maxMembers: number,
         maxIntake: number,
         maxStrikes: number,
         candidateDeposit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'SetParameters';
             params: { maxMembers: number; maxIntake: number; maxStrikes: number; candidateDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6039,15 +5850,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     punishSkeptic: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'PunishSkeptic';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6057,15 +5867,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimMembership: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ClaimMembership';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6077,16 +5886,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     bestowMembership: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'BestowMembership';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6100,16 +5908,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     kickCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'KickCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6120,15 +5927,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resignCandidacy: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'ResignCandidacy';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6142,16 +5948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} candidate
      **/
     dropCandidate: GenericTxCall<
-      Rv,
       (candidate: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'DropCandidate';
             params: { candidate: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6164,19 +5969,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupCandidacy: GenericTxCall<
-      Rv,
       (
         candidate: AccountId32Like,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupCandidacy';
             params: { candidate: AccountId32Like; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6189,26 +5993,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupChallenge: GenericTxCall<
-      Rv,
       (
         challengeRound: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Society';
           palletCall: {
             name: 'CleanupChallenge';
             params: { challengeRound: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Recovery`'s transaction calls
@@ -6228,19 +6031,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     asRecovered: GenericTxCall<
-      Rv,
       (
         account: MultiAddressLike,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'AsRecovered';
             params: { account: MultiAddressLike; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6258,19 +6060,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     setRecovered: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'SetRecovered';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6297,20 +6098,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayPeriod
      **/
     createRecovery: GenericTxCall<
-      Rv,
       (
         friends: Array<AccountId32Like>,
         threshold: number,
         delayPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CreateRecovery';
             params: { friends: Array<AccountId32Like>; threshold: number; delayPeriod: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6330,16 +6130,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     initiateRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'InitiateRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6361,19 +6160,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     vouchRecovery: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'VouchRecovery';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6391,16 +6189,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     claimRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'ClaimRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6420,16 +6217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     closeRecovery: GenericTxCall<
-      Rv,
       (rescuer: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CloseRecovery';
             params: { rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6448,15 +6244,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeRecovery: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'RemoveRecovery';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6472,23 +6267,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     cancelRecovered: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CancelRecovered';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -6507,15 +6301,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6535,16 +6328,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6567,19 +6359,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6604,20 +6395,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6648,19 +6438,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6676,26 +6465,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -6710,14 +6498,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -6729,7 +6515,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6740,19 +6527,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6766,7 +6552,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -6774,7 +6559,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -6787,7 +6571,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6797,16 +6582,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6819,14 +6603,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -6838,7 +6620,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6852,7 +6635,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -6860,7 +6642,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -6873,7 +6654,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6896,20 +6678,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6932,20 +6713,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6955,16 +6735,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6974,23 +6753,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Glutton`'s transaction calls
@@ -7008,19 +6786,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} witnessCount
      **/
     initializePallet: GenericTxCall<
-      Rv,
       (
         newCount: number,
         witnessCount: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Glutton';
           palletCall: {
             name: 'InitializePallet';
             params: { newCount: number; witnessCount: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7032,16 +6809,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU64} compute
      **/
     setCompute: GenericTxCall<
-      Rv,
       (compute: FixedU64) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Glutton';
           palletCall: {
             name: 'SetCompute';
             params: { compute: FixedU64 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7057,16 +6833,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU64} storage
      **/
     setStorage: GenericTxCall<
-      Rv,
       (storage: FixedU64) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Glutton';
           palletCall: {
             name: 'SetStorage';
             params: { storage: FixedU64 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7076,16 +6851,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<FixedBytes<1024>>} garbage
      **/
     bloat: GenericTxCall<
-      Rv,
       (garbage: Array<FixedBytes<1024>>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Glutton';
           palletCall: {
             name: 'Bloat';
             params: { garbage: Array<FixedBytes<1024>> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7100,23 +6874,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU64} blockLength
      **/
     setBlockLength: GenericTxCall<
-      Rv,
       (blockLength: FixedU64) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Glutton';
           palletCall: {
             name: 'SetBlockLength';
             params: { blockLength: FixedU64 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -7131,16 +6904,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7155,16 +6927,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7177,16 +6948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7198,16 +6968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7219,23 +6988,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -7257,13 +7025,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: KitchensinkRuntimeProxyType | undefined,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -7274,7 +7040,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7294,20 +7061,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: KitchensinkRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: KitchensinkRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7325,20 +7091,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: KitchensinkRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: KitchensinkRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7352,15 +7117,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7389,20 +7153,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: KitchensinkRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: KitchensinkRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7431,7 +7194,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: KitchensinkRuntimeProxyType,
@@ -7439,7 +7201,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -7452,7 +7213,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7477,19 +7239,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7509,19 +7270,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7541,19 +7301,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7576,14 +7335,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: KitchensinkRuntimeProxyType | undefined,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -7595,7 +7352,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: KitchensinkRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7611,22 +7369,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -7650,19 +7407,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: KitchensinkRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7714,7 +7470,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -7722,7 +7477,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: KitchensinkRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -7735,7 +7489,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7778,7 +7533,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -7786,7 +7540,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -7799,7 +7552,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7832,14 +7586,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -7851,7 +7603,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7875,27 +7628,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -7919,19 +7671,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7947,16 +7698,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7973,20 +7723,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8012,16 +7761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8037,16 +7785,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8066,19 +7813,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8095,16 +7841,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8122,16 +7867,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8150,19 +7894,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8184,27 +7927,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     approveBountyWithCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBountyWithCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Tips`'s transaction calls
@@ -8232,19 +7974,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     reportAwesome: GenericTxCall<
-      Rv,
       (
         reason: BytesLike,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'ReportAwesome';
             params: { reason: BytesLike; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8269,16 +8010,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     retractTip: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'RetractTip';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8308,20 +8048,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} tipValue
      **/
     tipNew: GenericTxCall<
-      Rv,
       (
         reason: BytesLike,
         who: MultiAddressLike,
         tipValue: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'TipNew';
             params: { reason: BytesLike; who: MultiAddressLike; tipValue: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8352,19 +8091,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} tipValue
      **/
     tip: GenericTxCall<
-      Rv,
       (
         hash: H256,
         tipValue: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'Tip';
             params: { hash: H256; tipValue: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8386,16 +8124,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     closeTip: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'CloseTip';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8414,23 +8151,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     slashTip: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Tips';
           palletCall: {
             name: 'SlashTip';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -8462,20 +8198,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8506,21 +8241,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8541,16 +8275,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8571,16 +8304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8601,16 +8333,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8629,16 +8360,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8661,20 +8391,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8700,20 +8429,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8742,20 +8470,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8784,20 +8511,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8828,21 +8554,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8864,19 +8589,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8896,19 +8620,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8926,16 +8649,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8953,16 +8675,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8982,19 +8703,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9018,21 +8738,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9060,21 +8779,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9094,16 +8812,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9130,7 +8847,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -9138,14 +8854,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9165,16 +8881,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9212,7 +8927,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -9223,7 +8937,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -9239,7 +8952,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9270,20 +8984,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9306,19 +9019,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9342,20 +9054,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9385,21 +9096,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9417,16 +9127,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9449,19 +9158,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9483,19 +9191,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9515,19 +9222,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9550,19 +9256,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9582,19 +9287,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9621,27 +9325,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PoolAssets`'s transaction calls
@@ -9673,20 +9376,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9717,21 +9419,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9752,16 +9453,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9782,16 +9482,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9812,16 +9511,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9840,16 +9538,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9872,20 +9569,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9911,20 +9607,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9953,20 +9648,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9995,20 +9689,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10039,21 +9732,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10075,19 +9767,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10107,19 +9798,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10137,16 +9827,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10164,16 +9853,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10193,19 +9881,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10229,21 +9916,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10271,21 +9957,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10305,16 +9990,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10341,7 +10025,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -10349,14 +10032,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10376,16 +10059,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10423,7 +10105,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -10434,7 +10115,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
@@ -10450,7 +10130,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10481,20 +10162,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10517,19 +10197,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10553,20 +10232,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10596,21 +10274,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10628,16 +10305,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10660,19 +10336,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10694,19 +10369,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10726,19 +10400,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10761,19 +10434,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10793,19 +10465,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10832,27 +10503,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Beefy`'s transaction calls
@@ -10868,19 +10538,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVoting';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10899,19 +10568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10924,16 +10592,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayInBlocks
      **/
     setNewGenesis: GenericTxCall<
-      Rv,
       (delayInBlocks: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'SetNewGenesis';
             params: { delayInBlocks: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10946,19 +10613,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVoting';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10976,19 +10642,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11001,12 +10666,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11016,7 +10679,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11034,12 +10698,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11049,14 +10711,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Lottery`'s transaction calls
@@ -11078,16 +10741,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     buyTicket: GenericTxCall<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lottery';
           palletCall: {
             name: 'BuyTicket';
             params: { call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11102,16 +10764,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<KitchensinkRuntimeRuntimeCallLike>} calls
      **/
     setCalls: GenericTxCall<
-      Rv,
       (calls: Array<KitchensinkRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lottery';
           palletCall: {
             name: 'SetCalls';
             params: { calls: Array<KitchensinkRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11133,21 +10794,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} repeat
      **/
     startLottery: GenericTxCall<
-      Rv,
       (
         price: bigint,
         length: number,
         delay: number,
         repeat: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lottery';
           palletCall: {
             name: 'StartLottery';
             params: { price: bigint; length: number; delay: number; repeat: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11159,22 +10819,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     stopRepeat: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Lottery';
           palletCall: {
             name: 'StopRepeat';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nis`'s transaction calls
@@ -11197,19 +10856,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     placeBid: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'PlaceBid';
             params: { amount: bigint; duration: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11226,19 +10884,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     retractBid: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'RetractBid';
             params: { amount: bigint; duration: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11249,15 +10906,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     fundDeficit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'FundDeficit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11275,19 +10931,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perquintill | undefined} maybeProportion
      **/
     thawPrivate: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeProportion: Perquintill | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'ThawPrivate';
             params: { index: number; maybeProportion: Perquintill | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11302,16 +10957,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     thawCommunal: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'ThawCommunal';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11321,16 +10975,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     communify: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'Communify';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11340,23 +10993,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     privatize: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nis';
           palletCall: {
             name: 'Privatize';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -11384,19 +11036,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: number,
         admin: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: number; admin: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11424,20 +11075,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: number; owner: MultiAddressLike; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11462,19 +11112,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11496,20 +11145,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: number; item: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11535,20 +11183,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         checkOwner: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number; checkOwner: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11576,20 +11223,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11616,19 +11262,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11648,19 +11293,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11680,19 +11324,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11710,16 +11353,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11737,16 +11379,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11767,19 +11408,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11803,14 +11443,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -11822,7 +11460,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11847,20 +11486,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11887,20 +11525,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         maybeCheckDelegate: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; maybeCheckDelegate: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11931,7 +11568,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
@@ -11941,7 +11577,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -11956,7 +11591,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11985,21 +11621,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12024,20 +11659,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12066,21 +11700,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12103,19 +11736,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12142,20 +11774,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12176,16 +11807,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12204,16 +11834,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12234,19 +11863,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12269,14 +11897,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -12288,7 +11914,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12308,27 +11935,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nfts`'s transaction calls
@@ -12355,19 +11981,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     create: GenericTxCall<
-      Rv,
       (
         admin: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Create';
             params: { admin: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12392,19 +12017,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         owner: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCreate';
             params: { owner: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12431,19 +12055,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletNftsDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletNftsDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12471,14 +12094,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintWitness | undefined} witnessData
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         witnessData: PalletNftsMintWitness | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -12490,7 +12111,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessData: PalletNftsMintWitness | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12515,21 +12137,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsItemConfig} itemConfig
      **/
     forceMint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         itemConfig: PalletNftsItemConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceMint';
             params: { collection: number; item: number; mintTo: MultiAddressLike; itemConfig: PalletNftsItemConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12550,19 +12171,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12587,20 +12207,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12627,19 +12246,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12659,19 +12277,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     lockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12691,19 +12308,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     unlockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UnlockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12725,19 +12341,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsBitFlags} lockSettings
      **/
     lockCollection: GenericTxCall<
-      Rv,
       (
         collection: number,
         lockSettings: PalletNftsBitFlags,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockCollection';
             params: { collection: number; lockSettings: PalletNftsBitFlags };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12758,19 +12373,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12798,14 +12412,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike | undefined,
         admin: MultiAddressLike | undefined,
         freezer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -12817,7 +12429,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12837,19 +12450,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     forceCollectionOwner: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionOwner';
             params: { collection: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12869,19 +12481,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCollectionConfig: GenericTxCall<
-      Rv,
       (
         collection: number,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionConfig';
             params: { collection: number; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12907,21 +12518,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeDeadline
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         maybeDeadline: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike; maybeDeadline: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12946,20 +12556,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12982,19 +12591,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearAllTransferApprovals: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearAllTransferApprovals';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13023,21 +12631,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} lockAttributes
      **/
     lockItemProperties: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         lockMetadata: boolean,
         lockAttributes: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemProperties';
             params: { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13072,7 +12679,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
@@ -13080,7 +12686,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13093,7 +12698,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13124,7 +12730,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     forceSetAttribute: GenericTxCall<
-      Rv,
       (
         setAs: AccountId32Like | undefined,
         collection: number,
@@ -13133,7 +12738,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13147,7 +12751,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13174,14 +12779,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         namespace: PalletNftsAttributeNamespace,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13193,7 +12796,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               key: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13213,20 +12817,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveItemAttributes: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveItemAttributes';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13248,14 +12851,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCancelAttributesApprovalWitness} witness
      **/
     cancelItemAttributesApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         witness: PalletNftsCancelAttributesApprovalWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13267,7 +12868,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletNftsCancelAttributesApprovalWitness;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13294,20 +12896,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13330,19 +12931,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13367,19 +12967,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13400,16 +12999,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13428,16 +13026,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13456,19 +13053,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13487,19 +13083,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintSettings} mintSettings
      **/
     updateMintSettings: GenericTxCall<
-      Rv,
       (
         collection: number,
         mintSettings: PalletNftsMintSettings,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UpdateMintSettings';
             params: { collection: number; mintSettings: PalletNftsMintSettings };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13522,14 +13117,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13541,7 +13134,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13561,20 +13155,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13590,16 +13183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletNftsItemTip>} tips
      **/
     payTips: GenericTxCall<
-      Rv,
       (tips: Array<PalletNftsItemTip>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'PayTips';
             params: { tips: Array<PalletNftsItemTip> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13629,7 +13221,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     createSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
@@ -13638,7 +13229,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maybePrice: PalletNftsPriceWithDirection | undefined,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13652,7 +13242,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13671,19 +13262,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} offeredItem
      **/
     cancelSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelSwap';
             params: { offeredCollection: number; offeredItem: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13708,7 +13298,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsPriceWithDirection | undefined} witnessPrice
      **/
     claimSwap: GenericTxCall<
-      Rv,
       (
         sendCollection: number,
         sendItem: number,
@@ -13716,7 +13305,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         receiveItem: number,
         witnessPrice: PalletNftsPriceWithDirection | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13729,7 +13317,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessPrice: PalletNftsPriceWithDirection | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13753,20 +13342,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     mintPreSigned: GenericTxCall<
-      Rv,
       (
         mintData: PalletNftsPreSignedMint,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'MintPreSigned';
             params: { mintData: PalletNftsPreSignedMint; signature: SpRuntimeMultiSignature; signer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13790,13 +13378,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     setAttributesPreSigned: GenericTxCall<
-      Rv,
       (
         data: PalletNftsPreSignedAttributes,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -13807,14 +13393,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signer: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NftFractionalization`'s transaction calls
@@ -13846,7 +13433,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fractions
      **/
     fractionalize: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
@@ -13854,7 +13440,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         beneficiary: MultiAddressLike,
         fractions: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
@@ -13867,7 +13452,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               fractions: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13895,28 +13481,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     unify: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
         assetId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
             name: 'Unify';
             params: { nftCollectionId: number; nftId: number; assetId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Salary`'s transaction calls
@@ -13929,15 +13514,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     init: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'Init';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13948,15 +13532,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bump: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'Bump';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13965,15 +13548,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     induct: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'Induct';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13987,15 +13569,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     register: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'Register';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14009,15 +13590,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     payout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'Payout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14033,16 +13613,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     payoutOther: GenericTxCall<
-      Rv,
       (beneficiary: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'PayoutOther';
             params: { beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14057,22 +13636,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     checkPayment: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Salary';
           palletCall: {
             name: 'CheckPayment';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CoreFellowship`'s transaction calls
@@ -14090,16 +13668,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     bump: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Bump';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14112,16 +13689,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletCoreFellowshipParamsType} params
      **/
     setParams: GenericTxCall<
-      Rv,
       (params: PalletCoreFellowshipParamsType) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'SetParams';
             params: { params: PalletCoreFellowshipParamsType };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14134,16 +13710,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isActive
      **/
     setActive: GenericTxCall<
-      Rv,
       (isActive: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'SetActive';
             params: { isActive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14162,19 +13737,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} atRank
      **/
     approve: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         atRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Approve';
             params: { who: AccountId32Like; atRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14187,16 +13761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     induct: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Induct';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14212,19 +13785,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} toRank
      **/
     promote: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         toRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Promote';
             params: { who: AccountId32Like; toRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14239,19 +13811,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} toRank
      **/
     promoteFast: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         toRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'PromoteFast';
             params: { who: AccountId32Like; toRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14265,16 +13836,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     offboard: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Offboard';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14294,19 +13864,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} evidence
      **/
     submitEvidence: GenericTxCall<
-      Rv,
       (
         wish: PalletCoreFellowshipWish,
         evidence: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'SubmitEvidence';
             params: { wish: PalletCoreFellowshipWish; evidence: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14321,15 +13890,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     import: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'Import';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14348,16 +13916,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     importMember: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'ImportMember';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14373,23 +13940,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletCoreFellowshipParamsTypeOption} partialParams
      **/
     setPartialParams: GenericTxCall<
-      Rv,
       (partialParams: PalletCoreFellowshipParamsTypeOption) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CoreFellowship';
           palletCall: {
             name: 'SetPartialParams';
             params: { partialParams: PalletCoreFellowshipParamsTypeOption };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TransactionStorage`'s transaction calls
@@ -14405,16 +13971,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     store: GenericTxCall<
-      Rv,
       (data: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionStorage';
           palletCall: {
             name: 'Store';
             params: { data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14430,19 +13995,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     renew: GenericTxCall<
-      Rv,
       (
         block: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionStorage';
           palletCall: {
             name: 'Renew';
             params: { block: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14457,23 +14021,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpTransactionStorageProofTransactionStorageProof} proof
      **/
     checkProof: GenericTxCall<
-      Rv,
       (proof: SpTransactionStorageProofTransactionStorageProof) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TransactionStorage';
           palletCall: {
             name: 'CheckProof';
             params: { proof: SpTransactionStorageProofTransactionStorageProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -14494,16 +14057,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14522,16 +14084,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14544,26 +14105,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -14577,16 +14137,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14618,13 +14177,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -14635,7 +14192,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14649,19 +14207,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14678,20 +14235,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14701,16 +14257,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14729,26 +14284,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -14780,20 +14334,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14820,21 +14373,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14863,19 +14415,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14919,19 +14470,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14959,20 +14509,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14998,19 +14547,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15042,26 +14590,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -15083,13 +14630,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: KitchensinkRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -15100,7 +14645,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15117,16 +14663,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15142,16 +14687,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15166,16 +14710,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15190,16 +14733,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15212,16 +14754,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15239,16 +14780,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15264,16 +14804,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15290,26 +14829,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Remark`'s transaction calls
@@ -15321,23 +14859,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     store: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Remark';
           palletCall: {
             name: 'Store';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RootTesting`'s transaction calls
@@ -15349,16 +14886,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} ratio
      **/
     fillBlock: GenericTxCall<
-      Rv,
       (ratio: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'FillBlock';
             params: { ratio: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15366,22 +14902,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     triggerDefensive: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'TriggerDefensive';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -15402,19 +14937,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15449,14 +14983,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -15468,7 +15000,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15491,16 +15024,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15519,19 +15051,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15570,19 +15101,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15609,27 +15139,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -15640,16 +15169,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15658,16 +15186,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15678,20 +15205,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15700,23 +15226,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AllianceMotion`'s transaction calls
@@ -15753,20 +15278,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} oldCount
      **/
     setMembers: GenericTxCall<
-      Rv,
       (
         newMembers: Array<AccountId32Like>,
         prime: AccountId32Like | undefined,
         oldCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'SetMembers';
             params: { newMembers: Array<AccountId32Like>; prime: AccountId32Like | undefined; oldCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15785,19 +15309,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     execute: GenericTxCall<
-      Rv,
       (
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'Execute';
             params: { proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15822,20 +15345,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15855,20 +15377,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15887,16 +15408,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     disapproveProposal: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'DisapproveProposal';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15932,14 +15452,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
@@ -15951,7 +15469,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15967,16 +15486,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     kill: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'Kill';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -15994,23 +15512,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} proposalHash
      **/
     releaseProposalCost: GenericTxCall<
-      Rv,
       (proposalHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AllianceMotion';
           palletCall: {
             name: 'ReleaseProposalCost';
             params: { proposalHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Alliance`'s transaction calls
@@ -16026,20 +15543,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     propose: GenericTxCall<
-      Rv,
       (
         threshold: number,
         proposal: KitchensinkRuntimeRuntimeCallLike,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'Propose';
             params: { threshold: number; proposal: KitchensinkRuntimeRuntimeCallLike; lengthBound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16053,20 +15569,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} approve
      **/
     vote: GenericTxCall<
-      Rv,
       (
         proposal: H256,
         index: number,
         approve: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'Vote';
             params: { proposal: H256; index: number; approve: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16081,19 +15596,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} allies
      **/
     initMembers: GenericTxCall<
-      Rv,
       (
         fellows: Array<AccountId32Like>,
         allies: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'InitMembers';
             params: { fellows: Array<AccountId32Like>; allies: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16105,16 +15619,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAllianceDisbandWitness} witness
      **/
     disband: GenericTxCall<
-      Rv,
       (witness: PalletAllianceDisbandWitness) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'Disband';
             params: { witness: PalletAllianceDisbandWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16124,16 +15637,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAllianceCid} rule
      **/
     setRule: GenericTxCall<
-      Rv,
       (rule: PalletAllianceCid) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'SetRule';
             params: { rule: PalletAllianceCid };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16143,16 +15655,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAllianceCid} announcement
      **/
     announce: GenericTxCall<
-      Rv,
       (announcement: PalletAllianceCid) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'Announce';
             params: { announcement: PalletAllianceCid };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16162,16 +15673,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletAllianceCid} announcement
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (announcement: PalletAllianceCid) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { announcement: PalletAllianceCid };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16180,15 +15690,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     joinAlliance: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'JoinAlliance';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16199,16 +15708,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     nominateAlly: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'NominateAlly';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16218,16 +15726,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} ally
      **/
     elevateAlly: GenericTxCall<
-      Rv,
       (ally: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'ElevateAlly';
             params: { ally: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16237,15 +15744,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     giveRetirementNotice: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'GiveRetirementNotice';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16257,15 +15763,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     retire: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'Retire';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16275,16 +15780,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     kickMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'KickMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16294,16 +15798,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletAllianceUnscrupulousItem>} items
      **/
     addUnscrupulousItems: GenericTxCall<
-      Rv,
       (items: Array<PalletAllianceUnscrupulousItem>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'AddUnscrupulousItems';
             params: { items: Array<PalletAllianceUnscrupulousItem> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16313,16 +15816,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletAllianceUnscrupulousItem>} items
      **/
     removeUnscrupulousItems: GenericTxCall<
-      Rv,
       (items: Array<PalletAllianceUnscrupulousItem>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'RemoveUnscrupulousItems';
             params: { items: Array<PalletAllianceUnscrupulousItem> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16337,14 +15839,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} lengthBound
      **/
     close: GenericTxCall<
-      Rv,
       (
         proposalHash: H256,
         index: number,
         proposalWeightBound: SpWeightsWeightV2Weight,
         lengthBound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
@@ -16356,7 +15856,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               lengthBound: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16367,22 +15868,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     abdicateFellowStatus: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Alliance';
           palletCall: {
             name: 'AbdicateFellowStatus';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -16410,19 +15910,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16438,16 +15937,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16463,15 +15961,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16512,19 +16009,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16540,19 +16036,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16584,19 +16079,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16625,21 +16119,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16658,7 +16151,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -16666,7 +16158,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -16679,7 +16170,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16701,19 +16193,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16733,19 +16224,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16759,19 +16249,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16796,7 +16285,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -16805,7 +16293,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -16819,7 +16306,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16838,14 +16326,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -16857,7 +16343,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16883,16 +16370,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16911,19 +16397,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16939,16 +16424,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16961,16 +16445,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -16985,19 +16468,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17012,19 +16494,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17038,19 +16519,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17075,16 +16555,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17100,16 +16579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17123,19 +16601,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17153,16 +16630,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17180,16 +16656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17207,23 +16682,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RankedPolls`'s transaction calls
@@ -17245,13 +16719,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: KitchensinkRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
@@ -17262,7 +16734,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17279,16 +16752,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17304,16 +16776,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17328,16 +16799,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17352,16 +16822,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17374,16 +16843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17401,16 +16869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17426,16 +16893,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17452,26 +16918,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedPolls';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RankedCollective`'s transaction calls
@@ -17488,16 +16953,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17512,16 +16976,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     promoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'PromoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17537,16 +17000,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     demoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'DemoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17563,19 +17025,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} minRank
      **/
     removeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         minRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike; minRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17596,19 +17057,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} aye
      **/
     vote: GenericTxCall<
-      Rv,
       (
         poll: number,
         aye: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'Vote';
             params: { poll: number; aye: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17628,19 +17088,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupPoll: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'CleanupPoll';
             params: { pollIndex: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17655,26 +17114,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newWho
      **/
     exchangeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newWho: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RankedCollective';
           palletCall: {
             name: 'ExchangeMember';
             params: { who: MultiAddressLike; newWho: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversion`'s transaction calls
@@ -17690,12 +17148,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} asset2
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17705,7 +17161,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17734,7 +17191,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} mintTo
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -17744,7 +17200,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2Min: bigint,
         mintTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17759,7 +17214,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               mintTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17776,7 +17232,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} withdrawTo
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -17785,7 +17240,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2MinReceive: bigint,
         withdrawTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17799,7 +17253,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               withdrawTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17818,7 +17273,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapExactTokensForTokens: GenericTxCall<
-      Rv,
       (
         path: Array<FrameSupportTokensFungibleUnionOfNativeOrWithId>,
         amountIn: bigint,
@@ -17826,7 +17280,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17839,7 +17292,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17858,7 +17312,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapTokensForExactTokens: GenericTxCall<
-      Rv,
       (
         path: Array<FrameSupportTokensFungibleUnionOfNativeOrWithId>,
         amountOut: bigint,
@@ -17866,7 +17319,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17879,7 +17331,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17900,12 +17353,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} asset2
      **/
     touch: GenericTxCall<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -17915,14 +17366,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -17958,15 +17410,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -17992,15 +17443,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18022,23 +17472,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -18051,19 +17500,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: number,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: number; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18088,28 +17536,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: number,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ExecuteOverweight';
             params: { messageOrigin: number; page: number; index: number; weightLimit: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Pov`'s transaction calls
@@ -18119,13 +17566,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     emitEvent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Pov';
           palletCall: 'EmitEvent';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18133,20 +17579,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     noop: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Pov';
           palletCall: 'Noop';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `TxPause`'s transaction calls
@@ -18161,16 +17606,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} fullName
      **/
     pause: GenericTxCall<
-      Rv,
       (fullName: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Pause';
             params: { fullName: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18183,23 +17627,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[BytesLike, BytesLike]} ident
      **/
     unpause: GenericTxCall<
-      Rv,
       (ident: [BytesLike, BytesLike]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'TxPause';
           palletCall: {
             name: 'Unpause';
             params: { ident: [BytesLike, BytesLike] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SafeMode`'s transaction calls
@@ -18215,15 +17658,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     enter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Enter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18237,15 +17679,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceEnter: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceEnter';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18264,15 +17705,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     extend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'Extend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18286,15 +17726,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExtend: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExtend';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18311,15 +17750,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceExit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceExit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18338,19 +17776,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceSlashDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceSlashDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18372,19 +17809,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     releaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18405,26 +17841,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} block
      **/
     forceReleaseDeposit: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         block: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SafeMode';
           palletCall: {
             name: 'ForceReleaseDeposit';
             params: { account: AccountId32Like; block: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -18440,16 +17875,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18466,20 +17900,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18491,15 +17924,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18513,23 +17945,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Broker`'s transaction calls
@@ -18544,16 +17975,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerConfigRecord} config
      **/
     configure: GenericTxCall<
-      Rv,
       (config: PalletBrokerConfigRecord) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Configure';
             params: { config: PalletBrokerConfigRecord };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18569,16 +17999,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletBrokerScheduleItem>} workload
      **/
     reserve: GenericTxCall<
-      Rv,
       (workload: Array<PalletBrokerScheduleItem>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Reserve';
             params: { workload: Array<PalletBrokerScheduleItem> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18594,16 +18023,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} itemIndex
      **/
     unreserve: GenericTxCall<
-      Rv,
       (itemIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Unreserve';
             params: { itemIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18622,19 +18050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} until
      **/
     setLease: GenericTxCall<
-      Rv,
       (
         task: number,
         until: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'SetLease';
             params: { task: number; until: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18653,19 +18080,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extraCores
      **/
     startSales: GenericTxCall<
-      Rv,
       (
         endPrice: bigint,
         extraCores: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'StartSales';
             params: { endPrice: bigint; extraCores: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18679,16 +18105,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} priceLimit
      **/
     purchase: GenericTxCall<
-      Rv,
       (priceLimit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Purchase';
             params: { priceLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18702,16 +18127,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} core
      **/
     renew: GenericTxCall<
-      Rv,
       (core: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Renew';
             params: { core: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18726,19 +18150,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newOwner
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         newOwner: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Transfer';
             params: { regionId: PalletBrokerRegionId; newOwner: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18754,19 +18177,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pivot
      **/
     partition: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         pivot: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Partition';
             params: { regionId: PalletBrokerRegionId; pivot: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18784,19 +18206,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerCoreMask} pivot
      **/
     interlace: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         pivot: PalletBrokerCoreMask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Interlace';
             params: { regionId: PalletBrokerRegionId; pivot: PalletBrokerCoreMask };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18815,20 +18236,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerFinality} finality
      **/
     assign: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         task: number,
         finality: PalletBrokerFinality,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Assign';
             params: { regionId: PalletBrokerRegionId; task: number; finality: PalletBrokerFinality };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18845,20 +18265,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerFinality} finality
      **/
     pool: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         payee: AccountId32Like,
         finality: PalletBrokerFinality,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'Pool';
             params: { regionId: PalletBrokerRegionId; payee: AccountId32Like; finality: PalletBrokerFinality };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18876,19 +18295,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxTimeslices
      **/
     claimRevenue: GenericTxCall<
-      Rv,
       (
         regionId: PalletBrokerRegionId,
         maxTimeslices: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'ClaimRevenue';
             params: { regionId: PalletBrokerRegionId; maxTimeslices: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18904,19 +18322,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} beneficiary
      **/
     purchaseCredit: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'PurchaseCredit';
             params: { amount: bigint; beneficiary: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18929,16 +18346,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerRegionId} regionId
      **/
     dropRegion: GenericTxCall<
-      Rv,
       (regionId: PalletBrokerRegionId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'DropRegion';
             params: { regionId: PalletBrokerRegionId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18951,16 +18367,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerRegionId} regionId
      **/
     dropContribution: GenericTxCall<
-      Rv,
       (regionId: PalletBrokerRegionId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'DropContribution';
             params: { regionId: PalletBrokerRegionId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18973,16 +18388,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     dropHistory: GenericTxCall<
-      Rv,
       (when: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'DropHistory';
             params: { when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -18997,19 +18411,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     dropRenewal: GenericTxCall<
-      Rv,
       (
         core: number,
         when: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'DropRenewal';
             params: { core: number; when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19022,16 +18435,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} coreCount
      **/
     requestCoreCount: GenericTxCall<
-      Rv,
       (coreCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'RequestCoreCount';
             params: { coreCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19040,16 +18452,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} coreCount
      **/
     notifyCoreCount: GenericTxCall<
-      Rv,
       (coreCount: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'NotifyCoreCount';
             params: { coreCount: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19058,16 +18469,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerOnDemandRevenueRecord} revenue
      **/
     notifyRevenue: GenericTxCall<
-      Rv,
       (revenue: PalletBrokerOnDemandRevenueRecord) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'NotifyRevenue';
             params: { revenue: PalletBrokerOnDemandRevenueRecord };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19089,20 +18499,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} workloadEndHint
      **/
     enableAutoRenew: GenericTxCall<
-      Rv,
       (
         core: number,
         task: number,
         workloadEndHint: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'EnableAutoRenew';
             params: { core: number; task: number; workloadEndHint: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19119,19 +18528,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} task
      **/
     disableAutoRenew: GenericTxCall<
-      Rv,
       (
         core: number,
         task: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'DisableAutoRenew';
             params: { core: number; task: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19153,19 +18561,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} core
      **/
     forceReserve: GenericTxCall<
-      Rv,
       (
         workload: Array<PalletBrokerScheduleItem>,
         core: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'ForceReserve';
             params: { workload: Array<PalletBrokerScheduleItem>; core: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19178,16 +18585,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} task
      **/
     removeLease: GenericTxCall<
-      Rv,
       (task: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'RemoveLease';
             params: { task: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19200,16 +18606,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletBrokerRegionId} regionId
      **/
     removeAssignment: GenericTxCall<
-      Rv,
       (regionId: PalletBrokerRegionId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'RemoveAssignment';
             params: { regionId: PalletBrokerRegionId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19219,26 +18624,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} other
      **/
     swapLeases: GenericTxCall<
-      Rv,
       (
         id: number,
         other: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Broker';
           palletCall: {
             name: 'SwapLeases';
             params: { id: number; other: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Mixnet`'s transaction calls
@@ -19251,26 +18655,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpMixnetAppSignature} signature
      **/
     register: GenericTxCall<
-      Rv,
       (
         registration: PalletMixnetRegistration,
         signature: SpMixnetAppSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Mixnet';
           palletCall: {
             name: 'Register';
             params: { registration: PalletMixnetRegistration; signature: SpMixnetAppSignature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -19285,23 +18688,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: KitchensinkRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: KitchensinkRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversionMigration`'s transaction calls
@@ -19317,12 +18719,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} asset2
      **/
     migrateToNewAccount: GenericTxCall<
-      Rv,
       (
         asset1: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversionMigration';
           palletCall: {
@@ -19332,14 +18732,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               asset2: FrameSupportTokensFungibleUnionOfNativeOrWithId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Revive`'s transaction calls
@@ -19365,16 +18766,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} payload
      **/
     ethTransact: GenericTxCall<
-      Rv,
       (payload: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'EthTransact';
             params: { payload: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19403,7 +18803,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: bigint,
@@ -19411,7 +18810,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -19424,7 +18822,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19443,7 +18842,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -19452,7 +18850,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -19466,7 +18863,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19507,7 +18905,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -19516,7 +18913,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -19530,7 +18926,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19552,19 +18949,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} storageDepositLimit
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UploadCode';
             params: { code: BytesLike; storageDepositLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19577,16 +18973,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19606,19 +19001,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: H160,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'SetCode';
             params: { dest: H160; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19630,15 +19024,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     mapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'MapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19650,15 +19043,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unmapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UnmapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19672,23 +19064,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {KitchensinkRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallbackAccount: GenericTxCall<
-      Rv,
       (call: KitchensinkRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'DispatchAsFallbackAccount';
             params: { call: KitchensinkRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRewards`'s transaction calls
@@ -19715,7 +19106,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} admin
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         stakedAssetId: FrameSupportTokensFungibleUnionOfNativeOrWithId,
         rewardAssetId: FrameSupportTokensFungibleUnionOfNativeOrWithId,
@@ -19723,7 +19113,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         expiry: FrameSupportScheduleDispatchTime,
         admin: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
@@ -19736,7 +19125,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               admin: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19749,19 +19139,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     stake: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'Stake';
             params: { poolId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19781,20 +19170,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} staker
      **/
     unstake: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
         staker: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'Unstake';
             params: { poolId: number; amount: bigint; staker: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19810,19 +19198,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} staker
      **/
     harvestRewards: GenericTxCall<
-      Rv,
       (
         poolId: number,
         staker: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'HarvestRewards';
             params: { poolId: number; staker: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19837,19 +19224,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newRewardRatePerBlock
      **/
     setPoolRewardRatePerBlock: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRewardRatePerBlock: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolRewardRatePerBlock';
             params: { poolId: number; newRewardRatePerBlock: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19862,19 +19248,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newAdmin
      **/
     setPoolAdmin: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newAdmin: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolAdmin';
             params: { poolId: number; newAdmin: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19889,19 +19274,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} newExpiry
      **/
     setPoolExpiryBlock: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newExpiry: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolExpiryBlock';
             params: { poolId: number; newExpiry: FrameSupportScheduleDispatchTime };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19916,19 +19300,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     depositRewardTokens: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'DepositRewardTokens';
             params: { poolId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -19943,23 +19326,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     cleanupPool: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'CleanupPool';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MetaTx`'s transaction calls
@@ -19974,22 +19356,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMetaTxMetaTx} metaTx
      **/
     dispatch: GenericTxCall<
-      Rv,
       (metaTx: PalletMetaTxMetaTx) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MetaTx';
           palletCall: {
             name: 'Dispatch';
             params: { metaTx: PalletMetaTxMetaTx };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/substrate/view-functions.d.ts b/packages/chaintypes/src/substrate/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/substrate/view-functions.d.ts
+++ b/packages/chaintypes/src/substrate/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/vara/consts.d.ts b/packages/chaintypes/src/vara/consts.d.ts
index 6a5a1aeb..3c845744 100644
--- a/packages/chaintypes/src/vara/consts.d.ts
+++ b/packages/chaintypes/src/vara/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Permill, Perbill, AccountId32, Perquintill, Percent } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -14,7 +14,7 @@ import type {
   GearCommonGasMultiplier,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
@@ -1071,37 +1071,6 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
      **/
     reservationsLimit: bigint;
 
-    /**
-     * The free of charge period of rent.
-     **/
-    programRentFreePeriod: number;
-
-    /**
-     * The minimal amount of blocks to resume.
-     **/
-    programResumeMinimalRentPeriod: number;
-
-    /**
-     * The program rent cost per block.
-     **/
-    programRentCostPerBlock: bigint;
-
-    /**
-     * The amount of blocks for processing resume session.
-     **/
-    programResumeSessionDuration: number;
-
-    /**
-     * The flag determines if program rent mechanism enabled.
-     **/
-    programRentEnabled: boolean;
-
-    /**
-     * The constant defines value that is added if the program
-     * rent is disabled.
-     **/
-    programRentDisabledDelta: number;
-
     /**
      * The account id of the rent pool if any.
      **/
@@ -1251,11 +1220,14 @@ export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<R
     queueCapacity: number;
 
     /**
-     * Constant defining amount of sessions in manager for keys rotation.
-     * Similar to `pallet_staking::SessionsPerEra`.
+     * Generic pallet constant
      **/
-    sessionsPerEra: number;
-
+    [name: string]: any;
+  };
+  /**
+   * Pallet `GrandpaSigner`'s constants
+   **/
+  grandpaSigner: {
     /**
      * Generic pallet constant
      **/
diff --git a/packages/chaintypes/src/vara/errors.d.ts b/packages/chaintypes/src/vara/errors.d.ts
index c98b5b51..44b64f5b 100644
--- a/packages/chaintypes/src/vara/errors.d.ts
+++ b/packages/chaintypes/src/vara/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -68,27 +68,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -98,43 +98,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -143,67 +143,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -212,32 +212,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -246,12 +246,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -260,33 +260,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `BagsList`'s errors
@@ -295,12 +295,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ImOnline`'s errors
@@ -309,17 +309,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Non existent public key.
      **/
-    InvalidKey: GenericPalletError<Rv>;
+    InvalidKey: GenericPalletError;
 
     /**
      * Duplicated heartbeat.
      **/
-    DuplicatedHeartbeat: GenericPalletError<Rv>;
+    DuplicatedHeartbeat: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -328,166 +328,166 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -496,63 +496,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -561,68 +561,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -631,77 +631,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FellowshipCollective`'s errors
@@ -710,62 +710,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account is already a member.
      **/
-    AlreadyMember: GenericPalletError<Rv>;
+    AlreadyMember: GenericPalletError;
 
     /**
      * Account is not a member.
      **/
-    NotMember: GenericPalletError<Rv>;
+    NotMember: GenericPalletError;
 
     /**
      * The given poll index is unknown or has closed.
      **/
-    NotPolling: GenericPalletError<Rv>;
+    NotPolling: GenericPalletError;
 
     /**
      * The given poll is still ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * There are no further records to be removed.
      **/
-    NoneRemaining: GenericPalletError<Rv>;
+    NoneRemaining: GenericPalletError;
 
     /**
      * Unexpected error in state.
      **/
-    Corruption: GenericPalletError<Rv>;
+    Corruption: GenericPalletError;
 
     /**
      * The member's rank is too low to vote.
      **/
-    RankTooLow: GenericPalletError<Rv>;
+    RankTooLow: GenericPalletError;
 
     /**
      * The information provided is incorrect.
      **/
-    InvalidWitness: GenericPalletError<Rv>;
+    InvalidWitness: GenericPalletError;
 
     /**
      * The origin is not sufficiently privileged to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The new member to exchange is the same as the old member
      **/
-    SameMember: GenericPalletError<Rv>;
+    SameMember: GenericPalletError;
 
     /**
      * The max member count for the rank has been reached.
      **/
-    TooManyMembers: GenericPalletError<Rv>;
+    TooManyMembers: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FellowshipReferenda`'s errors
@@ -774,77 +774,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -853,32 +853,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -887,32 +887,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -921,47 +921,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -970,137 +970,137 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -1109,47 +1109,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -1158,77 +1158,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found when attempting to cancel.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -1237,82 +1237,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Bounties`'s errors
@@ -1321,63 +1321,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Proposer's balance is too low.
      **/
-    InsufficientProposersBalance: GenericPalletError<Rv>;
+    InsufficientProposersBalance: GenericPalletError;
 
     /**
      * No proposal or bounty at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The reason given is just too big.
      **/
-    ReasonTooBig: GenericPalletError<Rv>;
+    ReasonTooBig: GenericPalletError;
 
     /**
      * The bounty status is unexpected.
      **/
-    UnexpectedStatus: GenericPalletError<Rv>;
+    UnexpectedStatus: GenericPalletError;
 
     /**
      * Require bounty curator.
      **/
-    RequireCurator: GenericPalletError<Rv>;
+    RequireCurator: GenericPalletError;
 
     /**
      * Invalid bounty value.
      **/
-    InvalidValue: GenericPalletError<Rv>;
+    InvalidValue: GenericPalletError;
 
     /**
      * Invalid bounty fee.
      **/
-    InvalidFee: GenericPalletError<Rv>;
+    InvalidFee: GenericPalletError;
 
     /**
      * A bounty payout is pending.
      * To cancel the bounty, you must unassign and slash the curator.
      **/
-    PendingPayout: GenericPalletError<Rv>;
+    PendingPayout: GenericPalletError;
 
     /**
      * The bounties cannot be claimed/closed because it's still in the countdown period.
      **/
-    Premature: GenericPalletError<Rv>;
+    Premature: GenericPalletError;
 
     /**
      * The bounty cannot be closed because it has active child bounties.
      **/
-    HasActiveChildBounty: GenericPalletError<Rv>;
+    HasActiveChildBounty: GenericPalletError;
 
     /**
      * Too many approvals are already queued.
      **/
-    TooManyQueued: GenericPalletError<Rv>;
+    TooManyQueued: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ChildBounties`'s errors
@@ -1386,22 +1386,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parent bounty is not in active state.
      **/
-    ParentBountyNotActive: GenericPalletError<Rv>;
+    ParentBountyNotActive: GenericPalletError;
 
     /**
      * The bounty balance is not enough to add new child-bounty.
      **/
-    InsufficientBountyBalance: GenericPalletError<Rv>;
+    InsufficientBountyBalance: GenericPalletError;
 
     /**
      * Number of child bounties exceeds limit `MaxActiveChildBountyCount`.
      **/
-    TooManyChildBounties: GenericPalletError<Rv>;
+    TooManyChildBounties: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -1410,44 +1410,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -1456,164 +1456,164 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearProgram`'s errors
    **/
   gearProgram: {
-    DuplicateItem: GenericPalletError<Rv>;
-    ProgramNotFound: GenericPalletError<Rv>;
-    NotActiveProgram: GenericPalletError<Rv>;
-    CannotFindDataForPage: GenericPalletError<Rv>;
-    ProgramCodeNotFound: GenericPalletError<Rv>;
+    DuplicateItem: GenericPalletError;
+    ProgramNotFound: GenericPalletError;
+    NotActiveProgram: GenericPalletError;
+    CannotFindDataForPage: GenericPalletError;
+    ProgramCodeNotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearMessenger`'s errors
@@ -1622,73 +1622,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Occurs when given key already exists in queue.
      **/
-    QueueDuplicateKey: GenericPalletError<Rv>;
+    QueueDuplicateKey: GenericPalletError;
 
     /**
      * Occurs when queue's element wasn't found in storage.
      **/
-    QueueElementNotFound: GenericPalletError<Rv>;
+    QueueElementNotFound: GenericPalletError;
 
     /**
      * Occurs when queue's head should contain value,
      * but it's empty for some reason.
      **/
-    QueueHeadShouldBeSet: GenericPalletError<Rv>;
+    QueueHeadShouldBeSet: GenericPalletError;
 
     /**
      * Occurs when queue's head should be empty,
      * but it contains value for some reason.
      **/
-    QueueHeadShouldNotBeSet: GenericPalletError<Rv>;
+    QueueHeadShouldNotBeSet: GenericPalletError;
 
     /**
      * Occurs when queue's tail element contains link
      * to the next element.
      **/
-    QueueTailHasNextKey: GenericPalletError<Rv>;
+    QueueTailHasNextKey: GenericPalletError;
 
     /**
      * Occurs when while searching queue's pre-tail,
      * element wasn't found.
      **/
-    QueueTailParentNotFound: GenericPalletError<Rv>;
+    QueueTailParentNotFound: GenericPalletError;
 
     /**
      * Occurs when queue's tail should contain value,
      * but it's empty for some reason.
      **/
-    QueueTailShouldBeSet: GenericPalletError<Rv>;
+    QueueTailShouldBeSet: GenericPalletError;
 
     /**
      * Occurs when queue's tail should be empty,
      * but it contains value for some reason.
      **/
-    QueueTailShouldNotBeSet: GenericPalletError<Rv>;
+    QueueTailShouldNotBeSet: GenericPalletError;
 
     /**
      * Occurs when given value already exists in mailbox.
      **/
-    MailboxDuplicateKey: GenericPalletError<Rv>;
+    MailboxDuplicateKey: GenericPalletError;
 
     /**
      * Occurs when mailbox's element wasn't found in storage.
      **/
-    MailboxElementNotFound: GenericPalletError<Rv>;
+    MailboxElementNotFound: GenericPalletError;
 
     /**
      * Occurs when given value already exists in waitlist.
      **/
-    WaitlistDuplicateKey: GenericPalletError<Rv>;
+    WaitlistDuplicateKey: GenericPalletError;
 
     /**
      * Occurs when waitlist's element wasn't found in storage.
      **/
-    WaitlistElementNotFound: GenericPalletError<Rv>;
+    WaitlistElementNotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearScheduler`'s errors
@@ -1697,33 +1697,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Occurs when given task already exists in task pool.
      **/
-    DuplicateTask: GenericPalletError<Rv>;
+    DuplicateTask: GenericPalletError;
 
     /**
      * Occurs when task wasn't found in storage.
      **/
-    TaskNotFound: GenericPalletError<Rv>;
+    TaskNotFound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearGas`'s errors
    **/
   gearGas: {
-    Forbidden: GenericPalletError<Rv>;
-    NodeAlreadyExists: GenericPalletError<Rv>;
-    InsufficientBalance: GenericPalletError<Rv>;
-    NodeNotFound: GenericPalletError<Rv>;
-    NodeWasConsumed: GenericPalletError<Rv>;
+    Forbidden: GenericPalletError;
+    NodeAlreadyExists: GenericPalletError;
+    InsufficientBalance: GenericPalletError;
+    NodeNotFound: GenericPalletError;
+    NodeWasConsumed: GenericPalletError;
 
     /**
      * Errors stating that gas tree has been invalidated
      **/
-    ParentIsLost: GenericPalletError<Rv>;
-    ParentHasNoChildren: GenericPalletError<Rv>;
+    ParentIsLost: GenericPalletError;
+    ParentHasNoChildren: GenericPalletError;
 
     /**
      * Output of `Tree::consume` procedure that wasn't expected.
@@ -1732,54 +1732,54 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * when unexpected one occurred. That signals, that algorithm works wrong
      * and expected invariants are not correct.
      **/
-    UnexpectedConsumeOutput: GenericPalletError<Rv>;
+    UnexpectedConsumeOutput: GenericPalletError;
 
     /**
      * Node type that can't occur if algorithm work well
      **/
-    UnexpectedNodeType: GenericPalletError<Rv>;
+    UnexpectedNodeType: GenericPalletError;
 
     /**
      * Value must have been caught, but was missed or blocked (for more info see `ValueNode::catch_value`).
      **/
-    ValueIsNotCaught: GenericPalletError<Rv>;
+    ValueIsNotCaught: GenericPalletError;
 
     /**
      * Value must have been caught or moved upstream, but was blocked (for more info see `ValueNode::catch_value`).
      **/
-    ValueIsBlocked: GenericPalletError<Rv>;
+    ValueIsBlocked: GenericPalletError;
 
     /**
      * Value must have been blocked, but was either moved or caught (for more info see `ValueNode::catch_value`).
      **/
-    ValueIsNotBlocked: GenericPalletError<Rv>;
+    ValueIsNotBlocked: GenericPalletError;
 
     /**
      * `GasTree::consume` called on node, which has some balance locked.
      **/
-    ConsumedWithLock: GenericPalletError<Rv>;
+    ConsumedWithLock: GenericPalletError;
 
     /**
      * `GasTree::consume` called on node, which has some system reservation.
      **/
-    ConsumedWithSystemReservation: GenericPalletError<Rv>;
+    ConsumedWithSystemReservation: GenericPalletError;
 
     /**
      * `GasTree::create` called with some value amount leading to
      * the total value overflow.
      **/
-    TotalValueIsOverflowed: GenericPalletError<Rv>;
+    TotalValueIsOverflowed: GenericPalletError;
 
     /**
      * Either `GasTree::consume` or `GasTree::spent` called on a node creating
      * negative imbalance which leads to the total value drop below 0.
      **/
-    TotalValueIsUnderflowed: GenericPalletError<Rv>;
+    TotalValueIsUnderflowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Gear`'s errors
@@ -1788,102 +1788,102 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Message wasn't found in the mailbox.
      **/
-    MessageNotFound: GenericPalletError<Rv>;
+    MessageNotFound: GenericPalletError;
 
     /**
      * Not enough balance to execute an action.
      *
      * Usually occurs when the gas_limit specified is such that the origin account can't afford the message.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Gas limit too high.
      *
      * Occurs when an extrinsic's declared `gas_limit` is greater than a block's maximum gas limit.
      **/
-    GasLimitTooHigh: GenericPalletError<Rv>;
+    GasLimitTooHigh: GenericPalletError;
 
     /**
      * Program already exists.
      *
      * Occurs if a program with some specific program id already exists in program storage.
      **/
-    ProgramAlreadyExists: GenericPalletError<Rv>;
+    ProgramAlreadyExists: GenericPalletError;
 
     /**
      * Program is terminated.
      *
      * Program init failed, so such message destination is no longer unavailable.
      **/
-    InactiveProgram: GenericPalletError<Rv>;
+    InactiveProgram: GenericPalletError;
 
     /**
      * Message gas tree is not found.
      *
      * When a message claimed from the mailbox has a corrupted or non-extant gas tree associated.
      **/
-    NoMessageTree: GenericPalletError<Rv>;
+    NoMessageTree: GenericPalletError;
 
     /**
      * Code already exists.
      *
      * Occurs when trying to save to storage a program code that has been saved there.
      **/
-    CodeAlreadyExists: GenericPalletError<Rv>;
+    CodeAlreadyExists: GenericPalletError;
 
     /**
      * Code does not exist.
      *
      * Occurs when trying to get a program code from storage, that doesn't exist.
      **/
-    CodeDoesntExist: GenericPalletError<Rv>;
+    CodeDoesntExist: GenericPalletError;
 
     /**
      * The code supplied to `upload_code` or `upload_program` exceeds the limit specified in the
      * current schedule.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * Failed to create a program.
      **/
-    ProgramConstructionFailed: GenericPalletError<Rv>;
+    ProgramConstructionFailed: GenericPalletError;
 
     /**
      * Message queue processing is disabled.
      **/
-    MessageQueueProcessingDisabled: GenericPalletError<Rv>;
+    MessageQueueProcessingDisabled: GenericPalletError;
 
     /**
      * Block count doesn't cover MinimalResumePeriod.
      **/
-    ResumePeriodLessThanMinimal: GenericPalletError<Rv>;
+    ResumePeriodLessThanMinimal: GenericPalletError;
 
     /**
      * Program with the specified id is not found.
      **/
-    ProgramNotFound: GenericPalletError<Rv>;
+    ProgramNotFound: GenericPalletError;
 
     /**
      * Gear::run() already included in current block.
      **/
-    GearRunAlreadyInBlock: GenericPalletError<Rv>;
+    GearRunAlreadyInBlock: GenericPalletError;
 
     /**
      * The program rent logic is disabled.
      **/
-    ProgramRentDisabled: GenericPalletError<Rv>;
+    ProgramRentDisabled: GenericPalletError;
 
     /**
      * Program is active.
      **/
-    ActiveProgram: GenericPalletError<Rv>;
+    ActiveProgram: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StakingRewards`'s errors
@@ -1892,17 +1892,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Pool not replenished due to error.
      **/
-    FailureToRefillPool: GenericPalletError<Rv>;
+    FailureToRefillPool: GenericPalletError;
 
     /**
      * Failure to withdraw funds from the rewards pool.
      **/
-    FailureToWithdrawFromPool: GenericPalletError<Rv>;
+    FailureToWithdrawFromPool: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearVoucher`'s errors
@@ -1911,62 +1911,62 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The origin is not eligible to execute call.
      **/
-    BadOrigin: GenericPalletError<Rv>;
+    BadOrigin: GenericPalletError;
 
     /**
      * Error trying transfer balance to/from voucher account.
      **/
-    BalanceTransfer: GenericPalletError<Rv>;
+    BalanceTransfer: GenericPalletError;
 
     /**
      * Destination program is not in whitelisted set for voucher.
      **/
-    InappropriateDestination: GenericPalletError<Rv>;
+    InappropriateDestination: GenericPalletError;
 
     /**
      * Voucher with given identifier doesn't exist for given spender id.
      **/
-    InexistentVoucher: GenericPalletError<Rv>;
+    InexistentVoucher: GenericPalletError;
 
     /**
      * Voucher still valid and couldn't be revoked.
      **/
-    IrrevocableYet: GenericPalletError<Rv>;
+    IrrevocableYet: GenericPalletError;
 
     /**
      * Try to whitelist more programs than allowed.
      **/
-    MaxProgramsLimitExceeded: GenericPalletError<Rv>;
+    MaxProgramsLimitExceeded: GenericPalletError;
 
     /**
      * Failed to query destination of the prepaid call.
      **/
-    UnknownDestination: GenericPalletError<Rv>;
+    UnknownDestination: GenericPalletError;
 
     /**
      * Voucher has expired and couldn't be used.
      **/
-    VoucherExpired: GenericPalletError<Rv>;
+    VoucherExpired: GenericPalletError;
 
     /**
      * Voucher issue/prolongation duration out of [min; max] constants.
      **/
-    DurationOutOfBounds: GenericPalletError<Rv>;
+    DurationOutOfBounds: GenericPalletError;
 
     /**
      * Voucher update function tries to cut voucher ability of code upload.
      **/
-    CodeUploadingEnabled: GenericPalletError<Rv>;
+    CodeUploadingEnabled: GenericPalletError;
 
     /**
      * Voucher is disabled for code uploading, but requested.
      **/
-    CodeUploadingDisabled: GenericPalletError<Rv>;
+    CodeUploadingDisabled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearBank`'s errors
@@ -1975,40 +1975,40 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Insufficient user balance.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Insufficient user's bank account gas balance.
      **/
-    InsufficientGasBalance: GenericPalletError<Rv>;
+    InsufficientGasBalance: GenericPalletError;
 
     /**
      * Insufficient user's bank account gas balance.
      **/
-    InsufficientValueBalance: GenericPalletError<Rv>;
+    InsufficientValueBalance: GenericPalletError;
 
     /**
      * Insufficient bank account balance.
      * **Must be unreachable in Gear main protocol.**
      **/
-    InsufficientBankBalance: GenericPalletError<Rv>;
+    InsufficientBankBalance: GenericPalletError;
 
     /**
      * Deposit of funds that will not keep bank account alive.
      * **Must be unreachable in Gear main protocol.**
      **/
-    InsufficientDeposit: GenericPalletError<Rv>;
+    InsufficientDeposit: GenericPalletError;
 
     /**
      * Overflow during funds transfer.
      * **Must be unreachable in Gear main protocol.**
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `GearEthBridge`'s errors
@@ -2018,39 +2018,59 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The error happens when bridge queue is temporarily overflowed
      * and needs cleanup to proceed.
      **/
-    BridgeCleanupRequired: GenericPalletError<Rv>;
+    BridgeCleanupRequired: GenericPalletError;
 
     /**
      * The error happens when bridge got called before
      * proper initialization after deployment.
      **/
-    BridgeIsNotYetInitialized: GenericPalletError<Rv>;
+    BridgeIsNotYetInitialized: GenericPalletError;
 
     /**
      * The error happens when bridge got called when paused.
      **/
-    BridgeIsPaused: GenericPalletError<Rv>;
+    BridgeIsPaused: GenericPalletError;
 
     /**
      * The error happens when bridging message sent with too big payload.
      **/
-    MaxPayloadSizeExceeded: GenericPalletError<Rv>;
+    MaxPayloadSizeExceeded: GenericPalletError;
 
     /**
      * The error happens when bridging thorough builtin and message value
      * is inapplicable to operation or insufficient.
      **/
-    InsufficientValueApplied: GenericPalletError<Rv>;
+    InsufficientValueApplied: GenericPalletError;
 
     /**
      * The error happens when attempted to reset overflowed queue, but
      * queue isn't overflowed or incorrect finality proof provided.
      **/
-    InvalidQueueReset: GenericPalletError<Rv>;
+    InvalidQueueReset: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
+  };
+  /**
+   * Pallet `GrandpaSigner`'s errors
+   **/
+  grandpaSigner: {
+    TooManyRequests: GenericPalletError;
+    RequestIdExhausted: GenericPalletError;
+    UnknownRequest: GenericPalletError;
+    RequestExpired: GenericPalletError;
+    AuthorityNotInSet: GenericPalletError;
+    AlreadySigned: GenericPalletError;
+    BadSignature: GenericPalletError;
+    UnsupportedSet: GenericPalletError;
+    PayloadTooLong: GenericPalletError;
+    MaxSignaturesReached: GenericPalletError;
+
+    /**
+     * Generic pallet error
+     **/
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/vara/events.d.ts b/packages/chaintypes/src/vara/events.d.ts
index 9a27b195..8ae21ef7 100644
--- a/packages/chaintypes/src/vara/events.d.ts
+++ b/packages/chaintypes/src/vara/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchInfo,
   DispatchError,
@@ -51,7 +51,7 @@ import type {
   PalletGearEthBridgePrimitivesEthMessage,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -59,13 +59,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<Rv, 'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: DispatchInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: DispatchInfo }
@@ -74,32 +73,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -109,7 +108,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -118,17 +116,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -137,40 +135,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -179,82 +176,82 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -265,7 +262,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -274,7 +270,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -284,12 +280,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -299,37 +295,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -339,17 +335,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `BagsList`'s events
@@ -358,17 +354,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'BagsList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'BagsList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'BagsList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'BagsList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ImOnline`'s events
@@ -378,7 +374,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new heartbeat was received from `AuthorityId`.
      **/
     HeartbeatReceived: GenericPalletEvent<
-      Rv,
       'ImOnline',
       'HeartbeatReceived',
       { authorityId: PalletImOnlineSr25519AppSr25519Public }
@@ -387,22 +382,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * At the end of the session, no offence was committed.
      **/
-    AllGood: GenericPalletEvent<Rv, 'ImOnline', 'AllGood', null>;
+    AllGood: GenericPalletEvent<'ImOnline', 'AllGood', null>;
 
     /**
      * At the end of the session, at least one validator was found to be offline.
      **/
-    SomeOffline: GenericPalletEvent<
-      Rv,
-      'ImOnline',
-      'SomeOffline',
-      { offline: Array<[AccountId32, SpStakingExposure]> }
-    >;
+    SomeOffline: GenericPalletEvent<'ImOnline', 'SomeOffline', { offline: Array<[AccountId32, SpStakingExposure]> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -412,18 +402,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -432,14 +416,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -449,17 +432,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -467,49 +445,43 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * The stakers' rewards are getting paid.
      **/
-    PayoutStarted: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'PayoutStarted',
-      { eraIndex: number; validatorStash: AccountId32 }
-    >;
+    PayoutStarted: GenericPalletEvent<'Staking', 'PayoutStarted', { eraIndex: number; validatorStash: AccountId32 }>;
 
     /**
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -518,27 +490,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -547,38 +519,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -587,18 +553,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       { index: number; assetKind: []; amount: bigint; beneficiary: AccountId32; validFrom: number; expireAt: number }
@@ -607,28 +567,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: [] }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: [] }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: [] }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -637,18 +597,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', AccountId32>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', AccountId32>;
 
     /**
      * An account that has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -658,7 +617,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote that been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote }
@@ -667,7 +625,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -677,7 +635,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -702,7 +659,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -727,7 +683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -752,7 +707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -772,7 +726,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -798,7 +751,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -809,7 +761,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -824,7 +775,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -844,7 +794,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -859,7 +808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -879,7 +827,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -899,7 +846,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -919,7 +865,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -939,7 +884,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -964,7 +908,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -984,7 +927,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -1003,7 +945,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FellowshipCollective`'s events
@@ -1012,24 +954,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A member `who` has been added.
      **/
-    MemberAdded: GenericPalletEvent<Rv, 'FellowshipCollective', 'MemberAdded', { who: AccountId32 }>;
+    MemberAdded: GenericPalletEvent<'FellowshipCollective', 'MemberAdded', { who: AccountId32 }>;
 
     /**
      * The member `who`se rank has been changed to the given `rank`.
      **/
-    RankChanged: GenericPalletEvent<Rv, 'FellowshipCollective', 'RankChanged', { who: AccountId32; rank: number }>;
+    RankChanged: GenericPalletEvent<'FellowshipCollective', 'RankChanged', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` of given `rank` has been removed from the collective.
      **/
-    MemberRemoved: GenericPalletEvent<Rv, 'FellowshipCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
+    MemberRemoved: GenericPalletEvent<'FellowshipCollective', 'MemberRemoved', { who: AccountId32; rank: number }>;
 
     /**
      * The member `who` has voted for the `poll` with the given `vote` leading to an updated
      * `tally`.
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'FellowshipCollective',
       'Voted',
       { who: AccountId32; poll: number; vote: PalletRankedCollectiveVoteRecord; tally: PalletRankedCollectiveTally }
@@ -1039,7 +980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The member `who` had their `AccountId` changed to `new_who`.
      **/
     MemberExchanged: GenericPalletEvent<
-      Rv,
       'FellowshipCollective',
       'MemberExchanged',
       { who: AccountId32; newWho: AccountId32 }
@@ -1048,7 +988,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FellowshipReferenda`'s events
@@ -1058,7 +998,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Submitted',
       {
@@ -1083,7 +1022,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionDepositPlaced',
       {
@@ -1108,7 +1046,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionDepositRefunded',
       {
@@ -1133,7 +1070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DepositSlashed',
       {
@@ -1153,7 +1089,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'DecisionStarted',
       {
@@ -1179,7 +1114,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'ConfirmStarted',
       {
@@ -1190,7 +1124,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'ConfirmAborted',
       {
@@ -1205,7 +1138,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Confirmed',
       {
@@ -1225,7 +1157,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Approved',
       {
@@ -1240,7 +1171,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Rejected',
       {
@@ -1260,7 +1190,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'TimedOut',
       {
@@ -1280,7 +1209,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Cancelled',
       {
@@ -1300,7 +1228,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'Killed',
       {
@@ -1320,7 +1247,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'SubmissionDepositRefunded',
       {
@@ -1345,7 +1271,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'MetadataSet',
       {
@@ -1365,7 +1290,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'FellowshipReferenda',
       'MetadataCleared',
       {
@@ -1384,16 +1308,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -1402,7 +1325,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -1411,18 +1334,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -1432,7 +1354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1442,7 +1363,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1452,7 +1372,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1462,7 +1381,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1473,7 +1391,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1483,7 +1400,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1492,7 +1408,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -1501,22 +1417,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1525,23 +1441,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1551,7 +1466,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1560,23 +1474,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1586,7 +1494,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1597,7 +1504,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1606,23 +1512,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1631,19 +1536,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1652,7 +1556,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1661,14 +1565,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       { pure: AccountId32; who: AccountId32; proxyType: VaraRuntimeProxyType; disambiguationIndex: number }
@@ -1677,13 +1580,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: VaraRuntimeProxyType; delay: number }
@@ -1693,7 +1595,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: VaraRuntimeProxyType; delay: number }
@@ -1702,7 +1603,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1712,7 +1613,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1722,7 +1622,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1732,7 +1631,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1748,7 +1646,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1757,7 +1654,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -1773,7 +1670,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -1787,7 +1683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -1798,23 +1693,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -1823,7 +1717,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -1834,12 +1728,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Bounties`'s events
@@ -1848,28 +1742,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * New bounty proposal.
      **/
-    BountyProposed: GenericPalletEvent<Rv, 'Bounties', 'BountyProposed', { index: number }>;
+    BountyProposed: GenericPalletEvent<'Bounties', 'BountyProposed', { index: number }>;
 
     /**
      * A bounty proposal was rejected; funds were slashed.
      **/
-    BountyRejected: GenericPalletEvent<Rv, 'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
+    BountyRejected: GenericPalletEvent<'Bounties', 'BountyRejected', { index: number; bond: bigint }>;
 
     /**
      * A bounty proposal is funded and became active.
      **/
-    BountyBecameActive: GenericPalletEvent<Rv, 'Bounties', 'BountyBecameActive', { index: number }>;
+    BountyBecameActive: GenericPalletEvent<'Bounties', 'BountyBecameActive', { index: number }>;
 
     /**
      * A bounty is awarded to a beneficiary.
      **/
-    BountyAwarded: GenericPalletEvent<Rv, 'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
+    BountyAwarded: GenericPalletEvent<'Bounties', 'BountyAwarded', { index: number; beneficiary: AccountId32 }>;
 
     /**
      * A bounty is claimed by beneficiary.
      **/
     BountyClaimed: GenericPalletEvent<
-      Rv,
       'Bounties',
       'BountyClaimed',
       { index: number; payout: bigint; beneficiary: AccountId32 }
@@ -1878,37 +1771,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A bounty is cancelled.
      **/
-    BountyCanceled: GenericPalletEvent<Rv, 'Bounties', 'BountyCanceled', { index: number }>;
+    BountyCanceled: GenericPalletEvent<'Bounties', 'BountyCanceled', { index: number }>;
 
     /**
      * A bounty expiry is extended.
      **/
-    BountyExtended: GenericPalletEvent<Rv, 'Bounties', 'BountyExtended', { index: number }>;
+    BountyExtended: GenericPalletEvent<'Bounties', 'BountyExtended', { index: number }>;
 
     /**
      * A bounty is approved.
      **/
-    BountyApproved: GenericPalletEvent<Rv, 'Bounties', 'BountyApproved', { index: number }>;
+    BountyApproved: GenericPalletEvent<'Bounties', 'BountyApproved', { index: number }>;
 
     /**
      * A bounty curator is proposed.
      **/
-    CuratorProposed: GenericPalletEvent<Rv, 'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
+    CuratorProposed: GenericPalletEvent<'Bounties', 'CuratorProposed', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * A bounty curator is unassigned.
      **/
-    CuratorUnassigned: GenericPalletEvent<Rv, 'Bounties', 'CuratorUnassigned', { bountyId: number }>;
+    CuratorUnassigned: GenericPalletEvent<'Bounties', 'CuratorUnassigned', { bountyId: number }>;
 
     /**
      * A bounty curator is accepted.
      **/
-    CuratorAccepted: GenericPalletEvent<Rv, 'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
+    CuratorAccepted: GenericPalletEvent<'Bounties', 'CuratorAccepted', { bountyId: number; curator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ChildBounties`'s events
@@ -1917,13 +1810,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is added.
      **/
-    Added: GenericPalletEvent<Rv, 'ChildBounties', 'Added', { index: number; childIndex: number }>;
+    Added: GenericPalletEvent<'ChildBounties', 'Added', { index: number; childIndex: number }>;
 
     /**
      * A child-bounty is awarded to a beneficiary.
      **/
     Awarded: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Awarded',
       { index: number; childIndex: number; beneficiary: AccountId32 }
@@ -1933,7 +1825,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A child-bounty is claimed by beneficiary.
      **/
     Claimed: GenericPalletEvent<
-      Rv,
       'ChildBounties',
       'Claimed',
       { index: number; childIndex: number; payout: bigint; beneficiary: AccountId32 }
@@ -1942,12 +1833,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A child-bounty is cancelled.
      **/
-    Canceled: GenericPalletEvent<Rv, 'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
+    Canceled: GenericPalletEvent<'ChildBounties', 'Canceled', { index: number; childIndex: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -1956,13 +1847,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -1971,12 +1861,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -1992,7 +1877,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -2007,7 +1891,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -2016,13 +1899,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -2036,7 +1918,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -2047,7 +1928,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -2056,13 +1936,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -2072,7 +1951,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -2082,7 +1960,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -2092,7 +1969,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -2102,7 +1978,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -2112,7 +1987,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -2122,7 +1996,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -2132,7 +2005,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -2141,7 +2013,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Gear`'s events
@@ -2152,7 +2024,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * added to the Gear message queue.
      **/
     MessageQueued: GenericPalletEvent<
-      Rv,
       'Gear',
       'MessageQueued',
       {
@@ -2184,7 +2055,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Somebody sent a message to the user.
      **/
     UserMessageSent: GenericPalletEvent<
-      Rv,
       'Gear',
       'UserMessageSent',
       {
@@ -2213,7 +2083,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * already inserted in `Mailbox`.
      **/
     UserMessageRead: GenericPalletEvent<
-      Rv,
       'Gear',
       'UserMessageRead',
       {
@@ -2235,7 +2104,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The result of processing the messages within the block.
      **/
     MessagesDispatched: GenericPalletEvent<
-      Rv,
       'Gear',
       'MessagesDispatched',
       {
@@ -2262,7 +2130,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * added to gear waitlist.
      **/
     MessageWaited: GenericPalletEvent<
-      Rv,
       'Gear',
       'MessageWaited',
       {
@@ -2302,7 +2169,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and was removed from `Waitlist`.
      **/
     MessageWoken: GenericPalletEvent<
-      Rv,
       'Gear',
       'MessageWoken',
       {
@@ -2324,7 +2190,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Any data related to program codes changed.
      **/
     CodeChanged: GenericPalletEvent<
-      Rv,
       'Gear',
       'CodeChanged',
       {
@@ -2346,7 +2211,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Any data related to programs changed.
      **/
     ProgramChanged: GenericPalletEvent<
-      Rv,
       'Gear',
       'ProgramChanged',
       {
@@ -2367,12 +2231,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The pseudo-inherent extrinsic that runs queue processing rolled back or not executed.
      **/
-    QueueNotProcessed: GenericPalletEvent<Rv, 'Gear', 'QueueNotProcessed', null>;
+    QueueNotProcessed: GenericPalletEvent<'Gear', 'QueueNotProcessed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingRewards`'s events
@@ -2381,42 +2245,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Deposited to the pool.
      **/
-    Deposited: GenericPalletEvent<Rv, 'StakingRewards', 'Deposited', { amount: bigint }>;
+    Deposited: GenericPalletEvent<'StakingRewards', 'Deposited', { amount: bigint }>;
 
     /**
      * Transferred from the pool to an external account.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'StakingRewards', 'Withdrawn', { amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'StakingRewards', 'Withdrawn', { amount: bigint }>;
 
     /**
      * Burned from the pool.
      **/
-    Burned: GenericPalletEvent<Rv, 'StakingRewards', 'Burned', { amount: bigint }>;
+    Burned: GenericPalletEvent<'StakingRewards', 'Burned', { amount: bigint }>;
 
     /**
      * Minted to the pool.
      **/
-    Minted: GenericPalletEvent<Rv, 'StakingRewards', 'Minted', { amount: bigint }>;
+    Minted: GenericPalletEvent<'StakingRewards', 'Minted', { amount: bigint }>;
 
     /**
      * Target inflation changed.
      **/
-    TargetInflationChanged: GenericPalletEvent<Rv, 'StakingRewards', 'TargetInflationChanged', { value: Perquintill }>;
+    TargetInflationChanged: GenericPalletEvent<'StakingRewards', 'TargetInflationChanged', { value: Perquintill }>;
 
     /**
      * Ideal staking ratio changed.
      **/
-    IdealStakingRatioChanged: GenericPalletEvent<
-      Rv,
-      'StakingRewards',
-      'IdealStakingRatioChanged',
-      { value: Perquintill }
-    >;
+    IdealStakingRatioChanged: GenericPalletEvent<'StakingRewards', 'IdealStakingRatioChanged', { value: Perquintill }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `GearVoucher`'s events
@@ -2426,7 +2285,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Voucher has been issued.
      **/
     VoucherIssued: GenericPalletEvent<
-      Rv,
       'GearVoucher',
       'VoucherIssued',
       {
@@ -2453,7 +2311,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: currently means only "refunded".
      **/
     VoucherRevoked: GenericPalletEvent<
-      Rv,
       'GearVoucher',
       'VoucherRevoked',
       {
@@ -2473,7 +2330,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Voucher has been updated.
      **/
     VoucherUpdated: GenericPalletEvent<
-      Rv,
       'GearVoucher',
       'VoucherUpdated',
       {
@@ -2498,7 +2354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Voucher has been declined (set to expired state).
      **/
     VoucherDeclined: GenericPalletEvent<
-      Rv,
       'GearVoucher',
       'VoucherDeclined',
       {
@@ -2517,7 +2372,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `GearEthBridge`'s events
@@ -2527,37 +2382,29 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Grandpa validator's keys set was hashed and set in storage at
      * first block of the last session in the era.
      **/
-    AuthoritySetHashChanged: GenericPalletEvent<Rv, 'GearEthBridge', 'AuthoritySetHashChanged', H256>;
-
-    /**
-     * Authority set hash was reset.
-     *
-     * Related to bridge clearing on initialization of the second block in a new era.
-     **/
-    AuthoritySetReset: GenericPalletEvent<Rv, 'GearEthBridge', 'AuthoritySetReset', null>;
+    AuthoritySetHashChanged: GenericPalletEvent<'GearEthBridge', 'AuthoritySetHashChanged', H256>;
 
     /**
      * Optimistically, single-time called event defining that pallet
      * got initialized and started processing session changes,
      * as well as putting initial zeroed queue merkle root.
      **/
-    BridgeInitialized: GenericPalletEvent<Rv, 'GearEthBridge', 'BridgeInitialized', null>;
+    BridgeInitialized: GenericPalletEvent<'GearEthBridge', 'BridgeInitialized', null>;
 
     /**
      * Bridge was paused and temporary doesn't process any incoming requests.
      **/
-    BridgePaused: GenericPalletEvent<Rv, 'GearEthBridge', 'BridgePaused', null>;
+    BridgePaused: GenericPalletEvent<'GearEthBridge', 'BridgePaused', null>;
 
     /**
      * Bridge was unpaused and from now on processes any incoming requests.
      **/
-    BridgeUnpaused: GenericPalletEvent<Rv, 'GearEthBridge', 'BridgeUnpaused', null>;
+    BridgeUnpaused: GenericPalletEvent<'GearEthBridge', 'BridgeUnpaused', null>;
 
     /**
      * A new message was queued for bridging.
      **/
     MessageQueued: GenericPalletEvent<
-      Rv,
       'GearEthBridge',
       'MessageQueued',
       {
@@ -2577,7 +2424,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Merkle root of the queue changed: new messages queued within the block.
      **/
     QueueMerkleRootChanged: GenericPalletEvent<
-      Rv,
       'GearEthBridge',
       'QueueMerkleRootChanged',
       {
@@ -2596,18 +2442,34 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Queue has been overflowed and now requires reset.
      **/
-    QueueOverflowed: GenericPalletEvent<Rv, 'GearEthBridge', 'QueueOverflowed', null>;
+    QueueOverflowed: GenericPalletEvent<'GearEthBridge', 'QueueOverflowed', null>;
 
     /**
      * Queue was reset.
      *
      * Related to bridge clearing on initialization of the second block in a new era.
      **/
-    QueueReset: GenericPalletEvent<Rv, 'GearEthBridge', 'QueueReset', null>;
+    QueueReset: GenericPalletEvent<'GearEthBridge', 'QueueReset', null>;
+
+    /**
+     * Generic pallet event
+     **/
+    [prop: string]: GenericPalletEvent;
+  };
+  /**
+   * Pallet `GrandpaSigner`'s events
+   **/
+  grandpaSigner: {
+    RequestScheduled: GenericPalletEvent<'GrandpaSigner', 'RequestScheduled', { requestId: number; setId: bigint }>;
+    SignatureAdded: GenericPalletEvent<
+      'GrandpaSigner',
+      'SignatureAdded',
+      { requestId: number; authority: FixedBytes<32>; count: number }
+    >;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/vara/index.d.ts b/packages/chaintypes/src/vara/index.d.ts
index 2372041a..701f7753 100644
--- a/packages/chaintypes/src/vara/index.d.ts
+++ b/packages/chaintypes/src/vara/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   VaraRuntimeRuntimeCall,
@@ -43,26 +43,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletGearPaymentCustomChargeTransactionPayment,
     FrameMetadataHashExtensionCheckMetadataHash,
   ];
-}
-
-export interface VersionedVaraApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: VaraApi
- * @specVersion: 1920
+ * @specVersion: 11000
  **/
-export interface VaraApi {
-  legacy: VersionedVaraApi<RpcLegacy>;
-  v2: VersionedVaraApi<RpcV2>;
+export interface VaraApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/vara/json-rpc.d.ts b/packages/chaintypes/src/vara/json-rpc.d.ts
index 08e6311c..89684686 100644
--- a/packages/chaintypes/src/vara/json-rpc.d.ts
+++ b/packages/chaintypes/src/vara/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'author_hasKey'
   | 'author_hasSessionKeys'
@@ -55,6 +55,10 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'gear_readStateBatch'
   | 'gear_readStateUsingWasm'
   | 'gear_readStateUsingWasmBatch'
+  | 'gear_subscribeProgramStateChanges'
+  | 'gear_subscribeUserMessageSent'
+  | 'gear_unsubscribeProgramStateChanges'
+  | 'gear_unsubscribeUserMessageSent'
   | 'grandpa_proveFinality'
   | 'grandpa_roundState'
   | 'grandpa_subscribeJustifications'
@@ -106,4 +110,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/vara/query.d.ts b/packages/chaintypes/src/vara/query.d.ts
index b9ad68b7..0ee3e58b 100644
--- a/packages/chaintypes/src/vara/query.d.ts
+++ b/packages/chaintypes/src/vara/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -111,9 +111,10 @@ import type {
   PalletGearVoucherInternalVoucherId,
   PalletGearBankBankAccount,
   PalletGearEthBridgeInternalQueueInfo,
+  PalletGrandpaSignerSigningRequest,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -124,35 +125,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -160,7 +161,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -168,28 +169,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -202,14 +203,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -226,21 +227,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -248,26 +249,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -278,7 +279,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -288,12 +289,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -304,12 +305,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -320,14 +321,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -335,14 +336,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -358,28 +359,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -394,7 +395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -402,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -410,7 +411,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -420,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -431,7 +432,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -442,7 +443,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -450,7 +451,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -458,7 +459,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -472,12 +473,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -488,28 +489,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -517,7 +518,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -534,19 +535,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -557,14 +558,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -595,7 +596,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -606,7 +607,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -616,7 +617,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -624,7 +625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -633,7 +634,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -641,7 +641,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -651,18 +651,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -673,14 +673,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -688,7 +688,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -696,7 +696,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, VaraRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, VaraRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, VaraRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -707,7 +707,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -715,7 +715,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<VaraRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => VaraRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => VaraRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -724,7 +724,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -732,7 +731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -743,19 +742,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -767,11 +766,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -780,12 +775,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BagsList`'s storage queries
@@ -799,14 +794,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -816,12 +811,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ImOnline`'s storage queries
@@ -842,14 +837,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    heartbeatAfter: GenericStorageQuery<Rv, () => number>;
+    heartbeatAfter: GenericStorageQuery<() => number>;
 
     /**
      * The current set of keys that may issue a heartbeat.
      *
      * @param {Callback<Array<PalletImOnlineSr25519AppSr25519Public>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<PalletImOnlineSr25519AppSr25519Public>>;
+    keys: GenericStorageQuery<() => Array<PalletImOnlineSr25519AppSr25519Public>>;
 
     /**
      * For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`.
@@ -857,7 +852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    receivedHeartbeats: GenericStorageQuery<Rv, (arg: [number, number]) => boolean | undefined, [number, number]>;
+    receivedHeartbeats: GenericStorageQuery<(arg: [number, number]) => boolean | undefined, [number, number]>;
 
     /**
      * For each session index, we keep a mapping of `ValidatorId<T>` to the
@@ -866,12 +861,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number> =} callback
      **/
-    authoredBlocks: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
+    authoredBlocks: GenericStorageQuery<(arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -882,14 +877,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -898,7 +893,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -908,28 +903,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -938,7 +933,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -949,7 +944,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -959,7 +954,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -969,14 +964,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -985,7 +980,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -1011,14 +1006,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -1031,14 +1026,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -1047,7 +1042,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -1057,7 +1052,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -1067,7 +1062,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -1078,7 +1073,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -1093,7 +1088,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -1113,7 +1108,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -1140,7 +1134,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -1157,7 +1150,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -1173,7 +1165,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -1186,7 +1178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1199,7 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1208,7 +1199,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1217,14 +1208,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1233,7 +1224,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1242,7 +1233,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1250,7 +1241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1258,7 +1249,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1268,7 +1259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1278,7 +1269,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1290,7 +1280,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1302,7 +1291,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1315,7 +1303,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1327,7 +1314,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * Indices of validators that have offended in the active era. The offenders are disabled for a
@@ -1340,7 +1327,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1349,12 +1336,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1365,7 +1352,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -1373,28 +1360,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1402,12 +1389,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -1419,19 +1406,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1445,7 +1432,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1458,12 +1444,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1474,7 +1460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1482,7 +1468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1493,7 +1479,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1501,7 +1487,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1514,12 +1500,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FellowshipCollective`'s storage queries
@@ -1532,7 +1518,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    memberCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The current members of the collective.
@@ -1540,11 +1526,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined,
-      AccountId32
-    >;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
 
     /**
      * The index of each ranks's member into the group of members who have at least that rank.
@@ -1552,7 +1534,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
+    idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
 
     /**
      * The members in the collective by index. All indices in the range `0..MemberCount` will
@@ -1561,7 +1543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
+    indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined, [number, number]>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1570,7 +1552,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
      **/
     voting: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined,
       [number, AccountId32]
     >;
@@ -1580,12 +1561,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FellowshipReferenda`'s storage queries
@@ -1596,7 +1577,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1604,7 +1585,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1615,7 +1596,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -1623,7 +1604,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -1636,12 +1617,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -1652,12 +1633,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -1667,7 +1648,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -1675,7 +1656,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -1683,11 +1664,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -1698,12 +1675,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1715,7 +1692,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -1723,19 +1700,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1751,7 +1728,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -1763,7 +1739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1775,7 +1751,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1785,7 +1761,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1794,7 +1770,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -1809,7 +1784,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1822,12 +1797,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1840,11 +1815,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1852,16 +1823,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1874,7 +1841,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1882,7 +1848,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -1898,14 +1864,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -1914,7 +1880,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -1924,7 +1890,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -1934,7 +1900,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -1944,7 +1910,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -1959,7 +1925,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -1971,7 +1937,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -1986,7 +1952,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -1999,12 +1964,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -2016,7 +1981,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -2025,7 +1990,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -2033,7 +1997,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2044,7 +2008,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2052,7 +2016,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2060,19 +2024,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2083,7 +2047,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of child bounties per parent bounty.
@@ -2092,7 +2056,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -2101,7 +2065,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -2112,7 +2075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    childBountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -2120,12 +2083,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2140,14 +2103,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2160,7 +2123,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2168,7 +2131,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2176,7 +2139,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2184,7 +2147,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2193,7 +2156,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2204,7 +2167,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2214,7 +2176,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2222,14 +2184,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2238,14 +2200,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2254,14 +2216,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2269,21 +2231,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2294,14 +2256,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2309,16 +2271,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearProgram`'s storage queries
@@ -2330,7 +2288,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<GearCoreCodeInstrumentedInstrumentedCode | undefined> =} callback
      **/
     instrumentedCodeStorage: GenericStorageQuery<
-      Rv,
       (arg: GprimitivesCodeId) => GearCoreCodeInstrumentedInstrumentedCode | undefined,
       GprimitivesCodeId
     >;
@@ -2340,7 +2297,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {GprimitivesCodeId} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    originalCodeStorage: GenericStorageQuery<Rv, (arg: GprimitivesCodeId) => Bytes | undefined, GprimitivesCodeId>;
+    originalCodeStorage: GenericStorageQuery<(arg: GprimitivesCodeId) => Bytes | undefined, GprimitivesCodeId>;
 
     /**
      *
@@ -2348,7 +2305,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<GearCoreCodeMetadataCodeMetadata | undefined> =} callback
      **/
     codeMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: GprimitivesCodeId) => GearCoreCodeMetadataCodeMetadata | undefined,
       GprimitivesCodeId
     >;
@@ -2359,7 +2315,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<NumeratedTreeIntervalsTree | undefined> =} callback
      **/
     allocationsStorage: GenericStorageQuery<
-      Rv,
       (arg: GprimitivesActorId) => NumeratedTreeIntervalsTree | undefined,
       GprimitivesActorId
     >;
@@ -2369,11 +2324,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {GprimitivesActorId} arg
      * @param {Callback<GearCoreProgram | undefined> =} callback
      **/
-    programStorage: GenericStorageQuery<
-      Rv,
-      (arg: GprimitivesActorId) => GearCoreProgram | undefined,
-      GprimitivesActorId
-    >;
+    programStorage: GenericStorageQuery<(arg: GprimitivesActorId) => GearCoreProgram | undefined, GprimitivesActorId>;
 
     /**
      *
@@ -2381,7 +2332,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<GearCoreMemoryPageBuf | undefined> =} callback
      **/
     memoryPages: GenericStorageQuery<
-      Rv,
       (arg: [GprimitivesActorId, GearCoreProgramMemoryInfix, GearCorePagesPage]) => GearCoreMemoryPageBuf | undefined,
       [GprimitivesActorId, GearCoreProgramMemoryInfix, GearCorePagesPage]
     >;
@@ -2389,7 +2339,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearMessenger`'s storage queries
@@ -2399,7 +2349,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    dequeued: GenericStorageQuery<Rv, () => number | undefined>;
+    dequeued: GenericStorageQuery<() => number | undefined>;
 
     /**
      *
@@ -2407,7 +2357,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<GearCommonStorageComplicatedDequeueLinkedNode | undefined> =} callback
      **/
     dispatches: GenericStorageQuery<
-      Rv,
       (arg: GprimitivesMessageId) => GearCommonStorageComplicatedDequeueLinkedNode | undefined,
       GprimitivesMessageId
     >;
@@ -2417,13 +2366,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDispatches: GenericStorageQuery<Rv, () => number>;
+    counterForDispatches: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<GprimitivesMessageId | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => GprimitivesMessageId | undefined>;
+    head: GenericStorageQuery<() => GprimitivesMessageId | undefined>;
 
     /**
      *
@@ -2431,7 +2380,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[GearCoreMessageUserUserStoredMessage, GearCommonStoragePrimitivesInterval] | undefined> =} callback
      **/
     mailbox: GenericStorageQuery<
-      Rv,
       (
         arg: [AccountId32Like, GprimitivesMessageId],
       ) => [GearCoreMessageUserUserStoredMessage, GearCommonStoragePrimitivesInterval] | undefined,
@@ -2442,19 +2390,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean | undefined> =} callback
      **/
-    queueProcessing: GenericStorageQuery<Rv, () => boolean | undefined>;
+    queueProcessing: GenericStorageQuery<() => boolean | undefined>;
 
     /**
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    sent: GenericStorageQuery<Rv, () => number | undefined>;
+    sent: GenericStorageQuery<() => number | undefined>;
 
     /**
      *
      * @param {Callback<GprimitivesMessageId | undefined> =} callback
      **/
-    tail: GenericStorageQuery<Rv, () => GprimitivesMessageId | undefined>;
+    tail: GenericStorageQuery<() => GprimitivesMessageId | undefined>;
 
     /**
      *
@@ -2462,7 +2410,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[GearCoreMessageStoredStoredDispatch, GearCommonStoragePrimitivesInterval] | undefined> =} callback
      **/
     waitlist: GenericStorageQuery<
-      Rv,
       (
         arg: [GprimitivesActorId, GprimitivesMessageId],
       ) => [GearCoreMessageStoredStoredDispatch, GearCommonStoragePrimitivesInterval] | undefined,
@@ -2475,7 +2422,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[GearCoreMessageStoredStoredDelayedDispatch, GearCommonStoragePrimitivesInterval] | undefined> =} callback
      **/
     dispatchStash: GenericStorageQuery<
-      Rv,
       (
         arg: GprimitivesMessageId,
       ) => [GearCoreMessageStoredStoredDelayedDispatch, GearCommonStoragePrimitivesInterval] | undefined,
@@ -2485,7 +2431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearScheduler`'s storage queries
@@ -2495,7 +2441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    firstIncompleteTasksBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    firstIncompleteTasksBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      *
@@ -2503,7 +2449,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     taskPool: GenericStorageQuery<
-      Rv,
       (arg: [number, GearCoreTasksScheduledTask]) => [] | undefined,
       [number, GearCoreTasksScheduledTask]
     >;
@@ -2511,7 +2456,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearGas`'s storage queries
@@ -2521,7 +2466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint | undefined>;
+    totalIssuance: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      *
@@ -2529,7 +2474,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<GearCommonGasProviderNodeGasNode | undefined> =} callback
      **/
     gasNodes: GenericStorageQuery<
-      Rv,
       (arg: GearCommonGasProviderNodeGasNodeId) => GearCommonGasProviderNodeGasNode | undefined,
       GearCommonGasProviderNodeGasNodeId
     >;
@@ -2538,12 +2482,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    allowance: GenericStorageQuery<Rv, () => bigint>;
+    allowance: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Gear`'s storage queries
@@ -2557,7 +2501,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    executeInherent: GenericStorageQuery<Rv, () => boolean>;
+    executeInherent: GenericStorageQuery<() => boolean>;
 
     /**
      * The current block number being processed.
@@ -2567,7 +2511,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    blockNumber: GenericStorageQuery<Rv, () => number>;
+    blockNumber: GenericStorageQuery<() => number>;
 
     /**
      * A guard to prohibit all but the first execution of `pallet_gear::run()` call in a block.
@@ -2578,12 +2522,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    gearRunInBlock: GenericStorageQuery<Rv, () => [] | undefined>;
+    gearRunInBlock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRewards`'s storage queries
@@ -2594,14 +2538,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perquintill> =} callback
      **/
-    targetInflation: GenericStorageQuery<Rv, () => Perquintill>;
+    targetInflation: GenericStorageQuery<() => Perquintill>;
 
     /**
      * Ideal staking ratio
      *
      * @param {Callback<Perquintill> =} callback
      **/
-    idealStakingRatio: GenericStorageQuery<Rv, () => Perquintill>;
+    idealStakingRatio: GenericStorageQuery<() => Perquintill>;
 
     /**
      * The current share of issued tokens that cannot be staked (e.g. being vested)
@@ -2610,7 +2554,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perquintill> =} callback
      **/
-    nonStakeableShare: GenericStorageQuery<Rv, () => Perquintill>;
+    nonStakeableShare: GenericStorageQuery<() => Perquintill>;
 
     /**
      * List of accounts whose locked balance (due to incomplete vesting) should be excluded from
@@ -2619,12 +2563,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    filteredAccounts: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    filteredAccounts: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearVoucher`'s storage queries
@@ -2637,7 +2581,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    issued: GenericStorageQuery<Rv, () => bigint | undefined>;
+    issued: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Double map storage containing data of the voucher,
@@ -2647,7 +2591,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletGearVoucherInternalVoucherInfo | undefined> =} callback
      **/
     vouchers: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PalletGearVoucherInternalVoucherId]) => PalletGearVoucherInternalVoucherInfo | undefined,
       [AccountId32, PalletGearVoucherInternalVoucherId]
     >;
@@ -2655,7 +2598,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearBank`'s storage queries
@@ -2666,37 +2609,37 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletGearBankBankAccount | undefined> =} callback
      **/
-    bank: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletGearBankBankAccount | undefined, AccountId32>;
+    bank: GenericStorageQuery<(arg: AccountId32Like) => PalletGearBankBankAccount | undefined, AccountId32>;
 
     /**
      *
      * @param {Callback<AccountId32> =} callback
      **/
-    bankAddress: GenericStorageQuery<Rv, () => AccountId32>;
+    bankAddress: GenericStorageQuery<() => AccountId32>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    unusedValue: GenericStorageQuery<Rv, () => bigint>;
+    unusedValue: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    onFinalizeTransfers: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    onFinalizeTransfers: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    onFinalizeValue: GenericStorageQuery<Rv, () => bigint>;
+    onFinalizeValue: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GearEthBridge`'s storage queries
@@ -2709,7 +2652,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => boolean>;
+    initialized: GenericStorageQuery<() => boolean>;
 
     /**
      * Lifecycle storage.
@@ -2718,7 +2661,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    paused: GenericStorageQuery<Rv, () => boolean>;
+    paused: GenericStorageQuery<() => boolean>;
 
     /**
      * Primary storage.
@@ -2730,7 +2673,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    authoritySetHash: GenericStorageQuery<Rv, () => H256 | undefined>;
+    authoritySetHash: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * Primary storage.
@@ -2742,7 +2685,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    queueMerkleRoot: GenericStorageQuery<Rv, () => H256 | undefined>;
+    queueMerkleRoot: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * Primary storage.
@@ -2751,7 +2694,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    queue: GenericStorageQuery<Rv, () => Array<H256>>;
+    queue: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Primary storage.
@@ -2760,7 +2703,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queueId: GenericStorageQuery<Rv, () => bigint>;
+    queueId: GenericStorageQuery<() => bigint>;
 
     /**
      * Helper storage.
@@ -2770,21 +2713,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletGearEthBridgeInternalQueueInfo | undefined> =} callback
      **/
-    queuesInfo: GenericStorageQuery<Rv, (arg: bigint) => PalletGearEthBridgeInternalQueueInfo | undefined, bigint>;
-
-    /**
-     * Operational storage.
-     *
-     * Declares timer of the session changes (`on_new_session` calls),
-     * when `queued_validators` must be stored within the pallet.
-     *
-     * **Invariant**: reducing each time on new session, it equals 0 only
-     * since storing grandpa keys hash until next session change,
-     * when it becomes `SessionPerEra - 1`.
-     *
-     * @param {Callback<number> =} callback
-     **/
-    sessionsTimer: GenericStorageQuery<Rv, () => number>;
+    queuesInfo: GenericStorageQuery<(arg: bigint) => PalletGearEthBridgeInternalQueueInfo | undefined, bigint>;
 
     /**
      * Operational storage.
@@ -2798,7 +2727,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    clearTimer: GenericStorageQuery<Rv, () => number | undefined>;
+    clearTimer: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Operational storage.
@@ -2807,7 +2736,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    messageNonce: GenericStorageQuery<Rv, () => U256>;
+    messageNonce: GenericStorageQuery<() => U256>;
 
     /**
      * Operational storage.
@@ -2817,7 +2746,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueChanged: GenericStorageQuery<Rv, () => boolean>;
+    queueChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * Operational storage.
@@ -2827,7 +2756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    queueOverflowedSince: GenericStorageQuery<Rv, () => number | undefined>;
+    queueOverflowedSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Operational storage.
@@ -2836,11 +2765,50 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    transportFee: GenericStorageQuery<Rv, () => bigint>;
+    transportFee: GenericStorageQuery<() => bigint>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `GrandpaSigner`'s storage queries
+   **/
+  grandpaSigner: {
+    /**
+     *
+     * @param {Callback<number> =} callback
+     **/
+    nextRequestId: GenericStorageQuery<() => number>;
+
+    /**
+     *
+     * @param {number} arg
+     * @param {Callback<PalletGrandpaSignerSigningRequest | undefined> =} callback
+     **/
+    requests: GenericStorageQuery<(arg: number) => PalletGrandpaSignerSigningRequest | undefined, number>;
+
+    /**
+     *
+     * @param {[number, FixedBytes<32>]} arg
+     * @param {Callback<FixedBytes<64> | undefined> =} callback
+     **/
+    signatures: GenericStorageQuery<
+      (arg: [number, FixedBytes<32>]) => FixedBytes<64> | undefined,
+      [number, FixedBytes<32>]
+    >;
+
+    /**
+     *
+     * @param {number} arg
+     * @param {Callback<number> =} callback
+     **/
+    signatureCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/vara/runtime.d.ts b/packages/chaintypes/src/vara/runtime.d.ts
index 69d62291..5145f4ba 100644
--- a/packages/chaintypes/src/vara/runtime.d.ts
+++ b/packages/chaintypes/src/vara/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   AccountId32Like,
   H256,
@@ -44,7 +44,7 @@ import type {
   PalletGearManagerHandleKind,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
    **/
@@ -54,21 +54,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -76,7 +76,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -96,7 +96,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -118,7 +117,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -128,7 +126,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -139,12 +137,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -158,7 +156,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: VaraRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -170,7 +167,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: VaraRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -180,7 +176,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -188,12 +184,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -205,7 +201,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -214,7 +210,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -223,7 +219,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -231,7 +227,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -239,7 +235,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -254,7 +250,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -268,7 +264,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -276,7 +272,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -284,12 +280,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -301,7 +297,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -310,7 +306,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -319,12 +315,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GearStakingRewardsApi - 0x29ca33476f4108aa
@@ -335,12 +331,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GearStakingRewardsApi_inflation_info
      **/
-    inflationInfo: GenericRuntimeApiMethod<Rv, () => Promise<PalletGearStakingRewardsInflationInfo>>;
+    inflationInfo: GenericRuntimeApiMethod<() => Promise<PalletGearStakingRewardsInflationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GearBuiltinApi - 0xf757f704c8ea14fe
@@ -352,12 +348,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GearBuiltinApi_query_actor_id
      * @param {bigint} builtin_id
      **/
-    queryActorId: GenericRuntimeApiMethod<Rv, (builtinId: bigint) => Promise<H256>>;
+    queryActorId: GenericRuntimeApiMethod<(builtinId: bigint) => Promise<H256>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GearEthBridgeApi - 0xfe1bbc43de74baec
@@ -369,12 +365,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GearEthBridgeApi_merkle_proof
      * @param {H256} hash
      **/
-    merkleProof: GenericRuntimeApiMethod<Rv, (hash: H256) => Promise<PalletGearEthBridgePrimitivesProof | undefined>>;
+    merkleProof: GenericRuntimeApiMethod<(hash: H256) => Promise<PalletGearEthBridgePrimitivesProof | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -394,7 +390,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -415,7 +411,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -425,12 +421,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -441,7 +437,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -449,7 +445,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -457,12 +453,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -473,7 +469,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -484,7 +480,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -493,12 +489,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -514,7 +510,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -525,7 +520,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -534,7 +529,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -546,14 +540,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -576,7 +569,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -589,7 +581,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -601,12 +593,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -624,7 +616,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -635,14 +627,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -658,7 +649,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -675,7 +666,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -700,7 +690,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -709,12 +698,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -726,12 +715,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -744,7 +733,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -755,7 +743,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -764,19 +751,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GearApi - 0xff8dc88037f26223
@@ -793,7 +780,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint} allowance_multiplier
      **/
     calculateReplyForHandle: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: H256,
         destination: H256,
@@ -816,7 +802,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} allowance_multiplier
      **/
     calculateGasInfo: GenericRuntimeApiMethod<
-      Rv,
       (
         source: H256,
         kind: PalletGearManagerHandleKind,
@@ -834,7 +819,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GearApi_gear_run_extrinsic
      * @param {bigint | undefined} max_gas
      **/
-    gearRunExtrinsic: GenericRuntimeApiMethod<Rv, (maxGas?: bigint | undefined) => Promise<UncheckedExtrinsic>>;
+    gearRunExtrinsic: GenericRuntimeApiMethod<(maxGas?: bigint | undefined) => Promise<UncheckedExtrinsic>>;
 
     /**
      *
@@ -844,7 +829,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} allowance_multiplier
      **/
     readState: GenericRuntimeApiMethod<
-      Rv,
       (programId: H256, payload: BytesLike, allowanceMultiplier?: bigint | undefined) => Promise<Result<Bytes, Bytes>>
     >;
 
@@ -859,7 +843,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} allowance_multiplier
      **/
     readStateUsingWasm: GenericRuntimeApiMethod<
-      Rv,
       (
         programId: H256,
         payload: BytesLike,
@@ -877,13 +860,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} allowance_multiplier
      **/
     readMetahash: GenericRuntimeApiMethod<
-      Rv,
       (programId: H256, allowanceMultiplier?: bigint | undefined) => Promise<Result<H256, Bytes>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/vara/tx.d.ts b/packages/chaintypes/src/vara/tx.d.ts
index c4b05b54..270c972a 100644
--- a/packages/chaintypes/src/vara/tx.d.ts
+++ b/packages/chaintypes/src/vara/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -74,16 +72,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = VaraRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<VaraRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -96,16 +96,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -115,16 +114,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -134,16 +132,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -156,16 +153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -175,16 +171,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -194,16 +189,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -217,19 +211,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -239,16 +232,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -261,16 +253,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -287,16 +278,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -314,23 +304,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -360,23 +349,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -392,19 +380,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -422,19 +409,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -447,23 +433,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -479,19 +464,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -510,19 +494,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -544,26 +527,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -582,19 +564,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -607,20 +588,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -636,19 +616,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -673,19 +652,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -698,19 +676,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -727,16 +704,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -749,19 +725,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -776,19 +751,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -805,26 +779,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -845,19 +818,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: VaraRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: VaraRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -877,22 +849,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -921,16 +892,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<VaraRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<VaraRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<VaraRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -953,19 +923,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: VaraRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -987,16 +956,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<VaraRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<VaraRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<VaraRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1012,19 +980,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: VaraRuntimeOriginCaller,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: VaraRuntimeOriginCaller; call: VaraRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1046,16 +1013,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<VaraRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<VaraRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<VaraRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1071,26 +1037,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: VaraRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: VaraRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1109,15 +1074,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1137,16 +1101,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1169,19 +1132,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1206,20 +1168,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1250,19 +1211,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1278,26 +1238,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `BagsList`'s transaction calls
@@ -1318,16 +1277,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BagsList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1346,16 +1304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BagsList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1368,26 +1325,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'BagsList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ImOnline`'s transaction calls
@@ -1402,26 +1358,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletImOnlineSr25519AppSr25519Signature} signature
      **/
     heartbeat: GenericTxCall<
-      Rv,
       (
         heartbeat: PalletImOnlineHeartbeat,
         signature: PalletImOnlineSr25519AppSr25519Signature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ImOnline';
           palletCall: {
             name: 'Heartbeat';
             params: { heartbeat: PalletImOnlineHeartbeat; signature: PalletImOnlineSr25519AppSr25519Signature };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -1449,19 +1404,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1484,16 +1438,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1521,16 +1474,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1562,16 +1514,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1585,16 +1536,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1613,16 +1563,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1640,15 +1589,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1669,16 +1617,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1700,15 +1647,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1723,16 +1669,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1748,16 +1693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1773,16 +1717,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1803,15 +1746,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1833,15 +1775,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1853,16 +1794,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1880,19 +1820,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1909,15 +1848,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1932,19 +1870,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1967,19 +1904,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1995,16 +1931,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2032,19 +1967,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2064,16 +1998,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2105,7 +2038,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -2115,7 +2047,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2130,7 +2061,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2165,16 +2097,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2186,16 +2117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2208,16 +2138,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2245,20 +2174,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2273,16 +2201,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2298,16 +2225,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2330,14 +2256,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -2349,14 +2273,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -2385,19 +2310,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2427,16 +2351,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2474,21 +2397,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: [],
         amount: bigint,
         beneficiary: AccountId32Like,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Spend';
             params: { assetKind: []; amount: bigint; beneficiary: AccountId32Like; validFrom: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2516,16 +2438,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2553,16 +2474,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2587,23 +2507,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -2624,19 +2543,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2671,14 +2589,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -2690,7 +2606,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2713,16 +2630,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2741,19 +2657,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2792,19 +2707,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2831,27 +2745,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -2873,13 +2786,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: VaraRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -2890,7 +2801,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2907,16 +2819,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2932,16 +2843,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2956,16 +2866,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2980,16 +2889,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3002,16 +2910,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3029,16 +2936,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3054,16 +2960,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3080,26 +2985,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FellowshipCollective`'s transaction calls
@@ -3116,16 +3020,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     addMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'AddMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3140,16 +3043,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     promoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'PromoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3165,16 +3067,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     demoteMember: GenericTxCall<
-      Rv,
       (who: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'DemoteMember';
             params: { who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3191,19 +3092,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} minRank
      **/
     removeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         minRank: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'RemoveMember';
             params: { who: MultiAddressLike; minRank: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3224,19 +3124,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} aye
      **/
     vote: GenericTxCall<
-      Rv,
       (
         poll: number,
         aye: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'Vote';
             params: { poll: number; aye: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3256,19 +3155,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     cleanupPoll: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         max: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'CleanupPoll';
             params: { pollIndex: number; max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3283,26 +3181,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newWho
      **/
     exchangeMember: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newWho: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipCollective';
           palletCall: {
             name: 'ExchangeMember';
             params: { who: MultiAddressLike; newWho: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FellowshipReferenda`'s transaction calls
@@ -3324,13 +3221,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: VaraRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
@@ -3341,7 +3236,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3358,16 +3254,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3383,16 +3278,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3407,16 +3301,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3431,16 +3324,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3453,16 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3480,16 +3371,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3505,16 +3395,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3531,26 +3420,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FellowshipReferenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -3561,16 +3449,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3579,16 +3466,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3599,20 +3485,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3621,23 +3506,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: VaraRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: VaraRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -3652,14 +3536,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3671,7 +3553,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3682,19 +3565,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3708,7 +3590,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -3716,7 +3597,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3729,7 +3609,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3739,16 +3620,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3761,14 +3641,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3780,7 +3658,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3794,7 +3673,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -3802,7 +3680,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3815,7 +3692,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3838,20 +3716,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3874,20 +3751,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3897,16 +3773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3916,23 +3791,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -3947,16 +3821,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3971,16 +3844,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3993,16 +3865,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4014,16 +3885,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4035,23 +3905,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -4069,16 +3938,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4097,16 +3965,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4124,16 +3991,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4149,15 +4015,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4183,19 +4048,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4214,16 +4078,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4240,19 +4103,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4269,19 +4131,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4298,19 +4159,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4337,21 +4197,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4372,16 +4231,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4398,19 +4256,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4424,19 +4281,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4452,16 +4308,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4479,15 +4334,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4502,20 +4356,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4525,16 +4378,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (authority: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4554,20 +4406,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetUsernameFor';
             params: { who: MultiAddressLike; username: BytesLike; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4578,16 +4429,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4599,16 +4449,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4618,16 +4467,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4638,23 +4486,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeDanglingUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveDanglingUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -4676,13 +4523,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: VaraRuntimeProxyType | undefined,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4693,7 +4538,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4713,20 +4559,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: VaraRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: VaraRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4744,20 +4589,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: VaraRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: VaraRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4771,15 +4615,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4808,20 +4651,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: VaraRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: VaraRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4850,7 +4692,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: VaraRuntimeProxyType,
@@ -4858,7 +4699,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4871,7 +4711,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4896,19 +4737,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4928,19 +4768,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4960,19 +4799,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4995,14 +4833,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: VaraRuntimeProxyType | undefined,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -5014,14 +4850,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: VaraRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -5045,19 +4882,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {VaraRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: VaraRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: VaraRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5109,7 +4945,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -5117,7 +4952,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: VaraRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5130,7 +4964,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5173,7 +5008,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -5181,7 +5015,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5194,7 +5027,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5227,14 +5061,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -5246,14 +5078,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -5279,12 +5112,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -5294,7 +5125,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5308,16 +5140,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5334,16 +5165,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5361,16 +5191,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5384,26 +5213,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeMaxTargets
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       (
         maybeMaxVoters: number | undefined,
         maybeMaxTargets: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
             params: { maybeMaxVoters: number | undefined; maybeMaxTargets: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Bounties`'s transaction calls
@@ -5427,19 +5255,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     proposeBounty: GenericTxCall<
-      Rv,
       (
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeBounty';
             params: { value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5455,16 +5282,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     approveBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ApproveBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5481,20 +5307,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { bountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5520,16 +5345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5545,16 +5369,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5574,19 +5397,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardBounty: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'AwardBounty';
             params: { bountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5603,16 +5425,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     claimBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ClaimBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5630,16 +5451,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bountyId
      **/
     closeBounty: GenericTxCall<
-      Rv,
       (bountyId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'CloseBounty';
             params: { bountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5658,26 +5478,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     extendBountyExpiry: GenericTxCall<
-      Rv,
       (
         bountyId: number,
         remark: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Bounties';
           palletCall: {
             name: 'ExtendBountyExpiry';
             params: { bountyId: number; remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ChildBounties`'s transaction calls
@@ -5709,20 +5528,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} description
      **/
     addChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         value: bigint,
         description: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AddChildBounty';
             params: { parentBountyId: number; value: bigint; description: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5749,21 +5567,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     proposeCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         curator: MultiAddressLike,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ProposeCurator';
             params: { parentBountyId: number; childBountyId: number; curator: MultiAddressLike; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5792,19 +5609,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     acceptCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AcceptCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5848,19 +5664,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     unassignCurator: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'UnassignCurator';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5888,20 +5703,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     awardChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'AwardChildBounty';
             params: { parentBountyId: number; childBountyId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5927,19 +5741,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     claimChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'ClaimChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5971,26 +5784,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} childBountyId
      **/
     closeChildBounty: GenericTxCall<
-      Rv,
       (
         parentBountyId: number,
         childBountyId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ChildBounties';
           palletCall: {
             name: 'CloseChildBounty';
             params: { parentBountyId: number; childBountyId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -6017,19 +5829,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6045,16 +5856,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6070,15 +5880,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6119,19 +5928,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6147,19 +5955,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6191,19 +5998,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6232,21 +6038,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6265,7 +6070,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -6273,7 +6077,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6286,7 +6089,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6308,19 +6112,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6340,19 +6143,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6366,19 +6168,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6403,7 +6204,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -6412,7 +6212,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6426,7 +6225,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6445,14 +6245,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -6464,7 +6262,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6489,16 +6288,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6517,19 +6315,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6545,16 +6342,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6567,16 +6363,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6591,19 +6386,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6618,19 +6412,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6644,19 +6437,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6670,16 +6462,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6695,16 +6486,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6718,19 +6508,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6746,16 +6535,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6773,16 +6561,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6800,23 +6587,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Gear`'s transaction calls
@@ -6843,16 +6629,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
             name: 'UploadCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6913,7 +6698,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     uploadProgram: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         salt: BytesLike,
@@ -6922,7 +6706,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
@@ -6936,7 +6719,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6966,7 +6750,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     createProgram: GenericTxCall<
-      Rv,
       (
         codeId: GprimitivesCodeId,
         salt: BytesLike,
@@ -6975,7 +6758,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
@@ -6989,7 +6771,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7019,7 +6802,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     sendMessage: GenericTxCall<
-      Rv,
       (
         destination: GprimitivesActorId,
         payload: BytesLike,
@@ -7027,7 +6809,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
@@ -7040,7 +6821,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7066,7 +6848,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     sendReply: GenericTxCall<
-      Rv,
       (
         replyToId: GprimitivesMessageId,
         payload: BytesLike,
@@ -7074,7 +6855,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
@@ -7087,7 +6867,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7104,16 +6885,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {GprimitivesMessageId} messageId
      **/
     claimValue: GenericTxCall<
-      Rv,
       (messageId: GprimitivesMessageId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
             name: 'ClaimValue';
             params: { messageId: GprimitivesMessageId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7123,16 +6903,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} maxGas
      **/
     run: GenericTxCall<
-      Rv,
       (maxGas: bigint | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
             name: 'Run';
             params: { maxGas: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7144,16 +6923,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     setExecuteInherent: GenericTxCall<
-      Rv,
       (value: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
             name: 'SetExecuteInherent';
             params: { value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7182,26 +6960,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {NonZeroU32} depth
      **/
     claimValueToInheritor: GenericTxCall<
-      Rv,
       (
         programId: GprimitivesActorId,
         depth: NonZeroU32,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Gear';
           palletCall: {
             name: 'ClaimValueToInheritor';
             params: { programId: GprimitivesActorId; depth: NonZeroU32 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingRewards`'s transaction calls
@@ -7212,16 +6989,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     refill: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRewards';
           palletCall: {
             name: 'Refill';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7231,19 +7007,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceRefill: GenericTxCall<
-      Rv,
       (
         from: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRewards';
           palletCall: {
             name: 'ForceRefill';
             params: { from: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7253,19 +7028,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         to: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRewards';
           palletCall: {
             name: 'Withdraw';
             params: { to: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7275,19 +7049,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} n
      **/
     setTargetInflation: GenericTxCall<
-      Rv,
       (
         p: bigint,
         n: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRewards';
           palletCall: {
             name: 'SetTargetInflation';
             params: { p: bigint; n: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7297,26 +7070,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} n
      **/
     setIdealStakingRatio: GenericTxCall<
-      Rv,
       (
         p: bigint,
         n: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRewards';
           palletCall: {
             name: 'SetIdealStakingRatio';
             params: { p: bigint; n: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `GearVoucher`'s transaction calls
@@ -7351,7 +7123,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     issue: GenericTxCall<
-      Rv,
       (
         spender: AccountId32Like,
         balance: bigint,
@@ -7359,7 +7130,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         codeUploading: boolean,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearVoucher';
           palletCall: {
@@ -7372,7 +7142,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7389,19 +7160,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletGearVoucherInternalPrepaidCall} call
      **/
     call: GenericTxCall<
-      Rv,
       (
         voucherId: PalletGearVoucherInternalVoucherId,
         call: PalletGearVoucherInternalPrepaidCall,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearVoucher';
           palletCall: {
             name: 'Call';
             params: { voucherId: PalletGearVoucherInternalVoucherId; call: PalletGearVoucherInternalPrepaidCall };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7424,19 +7194,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletGearVoucherInternalVoucherId} voucherId
      **/
     revoke: GenericTxCall<
-      Rv,
       (
         spender: AccountId32Like,
         voucherId: PalletGearVoucherInternalVoucherId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearVoucher';
           palletCall: {
             name: 'Revoke';
             params: { spender: AccountId32Like; voucherId: PalletGearVoucherInternalVoucherId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7477,7 +7246,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} prolongDuration
      **/
     update: GenericTxCall<
-      Rv,
       (
         spender: AccountId32Like,
         voucherId: PalletGearVoucherInternalVoucherId,
@@ -7487,7 +7255,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         codeUploading: boolean | undefined,
         prolongDuration: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearVoucher';
           palletCall: {
@@ -7502,7 +7269,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               prolongDuration: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7518,23 +7286,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletGearVoucherInternalVoucherId} voucherId
      **/
     decline: GenericTxCall<
-      Rv,
       (voucherId: PalletGearVoucherInternalVoucherId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearVoucher';
           palletCall: {
             name: 'Decline';
             params: { voucherId: PalletGearVoucherInternalVoucherId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `GearEthBridge`'s transaction calls
@@ -7546,15 +7313,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pause: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearEthBridge';
           palletCall: {
             name: 'Pause';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7564,15 +7330,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unpause: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearEthBridge';
           palletCall: {
             name: 'Unpause';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7584,19 +7349,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} payload
      **/
     sendEthMessage: GenericTxCall<
-      Rv,
       (
         destination: H160,
         payload: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearEthBridge';
           palletCall: {
             name: 'SendEthMessage';
             params: { destination: H160; payload: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7606,16 +7370,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (fee: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearEthBridge';
           palletCall: {
             name: 'SetFee';
             params: { fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7626,22 +7389,78 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} encodedFinalityProof
      **/
     resetOverflowedQueue: GenericTxCall<
-      Rv,
       (encodedFinalityProof: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'GearEthBridge';
           palletCall: {
             name: 'ResetOverflowedQueue';
             params: { encodedFinalityProof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
+  };
+  /**
+   * Pallet `GrandpaSigner`'s transaction calls
+   **/
+  grandpaSigner: {
+    /**
+     * Schedule a signing request for the current GRANDPA set.
+     *
+     * @param {BytesLike} payload
+     * @param {bigint | undefined} setId
+     * @param {number | undefined} expiresAt
+     **/
+    scheduleRequest: GenericTxCall<
+      (
+        payload: BytesLike,
+        setId: bigint | undefined,
+        expiresAt: number | undefined,
+      ) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'GrandpaSigner';
+          palletCall: {
+            name: 'ScheduleRequest';
+            params: { payload: BytesLike; setId: bigint | undefined; expiresAt: number | undefined };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Submit a GRANDPA signature for a scheduled request (unsigned).
+     *
+     * @param {number} requestId
+     * @param {FixedBytes<32>} authority
+     * @param {FixedBytes<64>} signature
+     **/
+    submitSignature: GenericTxCall<
+      (
+        requestId: number,
+        authority: FixedBytes<32>,
+        signature: FixedBytes<64>,
+      ) => ChainSubmittableExtrinsic<
+        {
+          pallet: 'GrandpaSigner';
+          palletCall: {
+            name: 'SubmitSignature';
+            params: { requestId: number; authority: FixedBytes<32>; signature: FixedBytes<64> };
+          };
+        },
+        ChainKnownTypes
+      >
+    >;
+
+    /**
+     * Generic pallet tx call
+     **/
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/vara/types.d.ts b/packages/chaintypes/src/vara/types.d.ts
index 3910a98c..83e1f9ab 100644
--- a/packages/chaintypes/src/vara/types.d.ts
+++ b/packages/chaintypes/src/vara/types.d.ts
@@ -85,7 +85,8 @@ export type VaraRuntimeRuntimeEvent =
   | { pallet: 'Gear'; palletEvent: PalletGearEvent }
   | { pallet: 'StakingRewards'; palletEvent: PalletGearStakingRewardsEvent }
   | { pallet: 'GearVoucher'; palletEvent: PalletGearVoucherEvent }
-  | { pallet: 'GearEthBridge'; palletEvent: PalletGearEthBridgeEvent };
+  | { pallet: 'GearEthBridge'; palletEvent: PalletGearEthBridgeEvent }
+  | { pallet: 'GrandpaSigner'; palletEvent: PalletGrandpaSignerEvent };
 
 /**
  * Event for the System pallet.
@@ -856,7 +857,8 @@ export type VaraRuntimeRuntimeCall =
   | { pallet: 'Gear'; palletCall: PalletGearCall }
   | { pallet: 'StakingRewards'; palletCall: PalletGearStakingRewardsCall }
   | { pallet: 'GearVoucher'; palletCall: PalletGearVoucherCall }
-  | { pallet: 'GearEthBridge'; palletCall: PalletGearEthBridgeCall };
+  | { pallet: 'GearEthBridge'; palletCall: PalletGearEthBridgeCall }
+  | { pallet: 'GrandpaSigner'; palletCall: PalletGrandpaSignerCall };
 
 export type VaraRuntimeRuntimeCallLike =
   | { pallet: 'System'; palletCall: FrameSystemCallLike }
@@ -888,7 +890,8 @@ export type VaraRuntimeRuntimeCallLike =
   | { pallet: 'Gear'; palletCall: PalletGearCallLike }
   | { pallet: 'StakingRewards'; palletCall: PalletGearStakingRewardsCallLike }
   | { pallet: 'GearVoucher'; palletCall: PalletGearVoucherCallLike }
-  | { pallet: 'GearEthBridge'; palletCall: PalletGearEthBridgeCallLike };
+  | { pallet: 'GearEthBridge'; palletCall: PalletGearEthBridgeCallLike }
+  | { pallet: 'GrandpaSigner'; palletCall: PalletGrandpaSignerCallLike };
 
 /**
  * Contains a variant per dispatchable extrinsic that this pallet has.
@@ -7505,6 +7508,32 @@ export type PalletGearEthBridgeCallLike =
    **/
   | { name: 'ResetOverflowedQueue'; params: { encodedFinalityProof: BytesLike } };
 
+/**
+ * Contains a variant per dispatchable extrinsic that this pallet has.
+ **/
+export type PalletGrandpaSignerCall =
+  /**
+   * Schedule a signing request for the current GRANDPA set.
+   **/
+  | { name: 'ScheduleRequest'; params: { payload: Bytes; setId?: bigint | undefined; expiresAt?: number | undefined } }
+  /**
+   * Submit a GRANDPA signature for a scheduled request (unsigned).
+   **/
+  | { name: 'SubmitSignature'; params: { requestId: number; authority: FixedBytes<32>; signature: FixedBytes<64> } };
+
+export type PalletGrandpaSignerCallLike =
+  /**
+   * Schedule a signing request for the current GRANDPA set.
+   **/
+  | {
+      name: 'ScheduleRequest';
+      params: { payload: BytesLike; setId?: bigint | undefined; expiresAt?: number | undefined };
+    }
+  /**
+   * Submit a GRANDPA signature for a scheduled request (unsigned).
+   **/
+  | { name: 'SubmitSignature'; params: { requestId: number; authority: FixedBytes<32>; signature: FixedBytes<64> } };
+
 export type SpRuntimeBlakeTwo256 = {};
 
 export type PalletConvictionVotingTally = { ayes: bigint; nays: bigint; support: bigint };
@@ -8540,14 +8569,12 @@ export type GearCoreMessageUserUserMessage = {
   id: GprimitivesMessageId;
   source: GprimitivesActorId;
   destination: GprimitivesActorId;
-  payload: GearCoreBufferLimitedVec;
+  payload: GearCoreLimitedVecLimitedVec;
   value: bigint;
   details?: GearCoreMessageCommonReplyDetails | undefined;
 };
 
-export type GearCoreBufferLimitedVec = Bytes;
-
-export type GearCoreBufferPayloadSizeError = {};
+export type GearCoreLimitedVecLimitedVec = Bytes;
 
 export type GearCoreMessageCommonReplyDetails = { to: GprimitivesMessageId; code: GearCoreErrorsSimpleReplyCode };
 
@@ -8753,12 +8780,6 @@ export type PalletGearEthBridgeEvent =
    * first block of the last session in the era.
    **/
   | { name: 'AuthoritySetHashChanged'; data: H256 }
-  /**
-   * Authority set hash was reset.
-   *
-   * Related to bridge clearing on initialization of the second block in a new era.
-   **/
-  | { name: 'AuthoritySetReset' }
   /**
    * Optimistically, single-time called event defining that pallet
    * got initialized and started processing session changes,
@@ -8820,6 +8841,13 @@ export type PalletGearEthBridgeEvent =
 
 export type PalletGearEthBridgePrimitivesEthMessage = { nonce: U256; source: H256; destination: H160; payload: Bytes };
 
+/**
+ * The `Event` enum of this pallet
+ **/
+export type PalletGrandpaSignerEvent =
+  | { name: 'RequestScheduled'; data: { requestId: number; setId: bigint } }
+  | { name: 'SignatureAdded'; data: { requestId: number; authority: FixedBytes<32>; count: number } };
+
 export type FrameSystemLastRuntimeUpgradeInfo = { specVersion: number; specName: string };
 
 export type FrameSystemCodeUpgradeAuthorization = { codeHash: H256; checkVersion: boolean };
@@ -10445,11 +10473,7 @@ export type GearCoreProgramProgramState =
   | { type: 'Uninitialized'; value: { messageId: GprimitivesMessageId } }
   | { type: 'Initialized' };
 
-export type GearCoreMemoryPageBuf = GearCoreBufferLimitedVecIntoPageBufError;
-
-export type GearCoreBufferLimitedVecIntoPageBufError = Bytes;
-
-export type GearCoreMemoryIntoPageBufError = {};
+export type GearCoreMemoryPageBuf = FixedArray<bigint, 2048>;
 
 /**
  * The `Error` enum of this pallet.
@@ -10476,7 +10500,7 @@ export type GearCoreMessageStoredStoredMessage = {
   id: GprimitivesMessageId;
   source: GprimitivesActorId;
   destination: GprimitivesActorId;
-  payload: GearCoreBufferLimitedVec;
+  payload: GearCoreLimitedVecLimitedVec;
   value: bigint;
   details?: GearCoreMessageCommonMessageDetails | undefined;
 };
@@ -10504,7 +10528,7 @@ export type GearCoreMessageUserUserStoredMessage = {
   id: GprimitivesMessageId;
   source: GprimitivesActorId;
   destination: GprimitivesActorId;
-  payload: GearCoreBufferLimitedVec;
+  payload: GearCoreLimitedVecLimitedVec;
   value: bigint;
 };
 
@@ -10575,16 +10599,12 @@ export type PalletGearMessengerError =
   | 'WaitlistElementNotFound';
 
 export type GearCoreTasksScheduledTask =
-  | { type: 'PauseProgram'; value: GprimitivesActorId }
-  | { type: 'RemoveCode'; value: GprimitivesCodeId }
   | { type: 'RemoveFromMailbox'; value: [AccountId32, GprimitivesMessageId] }
   | { type: 'RemoveFromWaitlist'; value: [GprimitivesActorId, GprimitivesMessageId] }
-  | { type: 'RemovePausedProgram'; value: GprimitivesActorId }
   | { type: 'WakeMessage'; value: [GprimitivesActorId, GprimitivesMessageId] }
   | { type: 'SendDispatch'; value: GprimitivesMessageId }
   | { type: 'SendUserMessage'; value: { messageId: GprimitivesMessageId; toMailbox: boolean } }
-  | { type: 'RemoveGasReservation'; value: [GprimitivesActorId, GprimitivesReservationId] }
-  | { type: 'RemoveResumeSession'; value: number };
+  | { type: 'RemoveGasReservation'; value: [GprimitivesActorId, GprimitivesReservationId] };
 
 /**
  * The `Error` enum of this pallet.
@@ -10744,6 +10764,7 @@ export type PalletGearScheduleLimits = {
   payloadLen: number;
   codeLen: number;
   dataSegmentsAmount: number;
+  typeSectionLen: number;
 };
 
 export type PalletGearScheduleInstructionWeights = {
@@ -11190,6 +11211,29 @@ export type PalletGearEthBridgeError =
    **/
   | 'InvalidQueueReset';
 
+export type PalletGrandpaSignerSigningRequest = {
+  id: number;
+  payload: Bytes;
+  setId: bigint;
+  createdAt: number;
+  expiresAt?: number | undefined;
+};
+
+/**
+ * The `Error` enum of this pallet.
+ **/
+export type PalletGrandpaSignerError =
+  | 'TooManyRequests'
+  | 'RequestIdExhausted'
+  | 'UnknownRequest'
+  | 'RequestExpired'
+  | 'AuthorityNotInSet'
+  | 'AlreadySigned'
+  | 'BadSignature'
+  | 'UnsupportedSet'
+  | 'PayloadTooLong'
+  | 'MaxSignaturesReached';
+
 export type PalletGearStakingRewardsExtensionStakingBlackList = {};
 
 export type FrameSystemExtensionsCheckNonZeroSender = {};
@@ -11354,4 +11398,5 @@ export type VaraRuntimeRuntimeError =
   | { pallet: 'StakingRewards'; palletError: PalletGearStakingRewardsError }
   | { pallet: 'GearVoucher'; palletError: PalletGearVoucherError }
   | { pallet: 'GearBank'; palletError: PalletGearBankError }
-  | { pallet: 'GearEthBridge'; palletError: PalletGearEthBridgeError };
+  | { pallet: 'GearEthBridge'; palletError: PalletGearEthBridgeError }
+  | { pallet: 'GrandpaSigner'; palletError: PalletGrandpaSignerError };
diff --git a/packages/chaintypes/src/vara/view-functions.d.ts b/packages/chaintypes/src/vara/view-functions.d.ts
index cfd3bb0b..9ebf5c1c 100644
--- a/packages/chaintypes/src/vara/view-functions.d.ts
+++ b/packages/chaintypes/src/vara/view-functions.d.ts
@@ -1,5 +1,5 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {}
+export interface ChainViewFunctions extends GenericChainViewFunctions {}
diff --git a/packages/chaintypes/src/westend-asset-hub/consts.d.ts b/packages/chaintypes/src/westend-asset-hub/consts.d.ts
index b93de50f..a49a5623 100644
--- a/packages/chaintypes/src/westend-asset-hub/consts.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, AccountId32, Bytes, Permill, Perbill, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -15,7 +15,7 @@ import type {
   PalletReferendaTrackDetails,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/westend-asset-hub/errors.d.ts b/packages/chaintypes/src/westend-asset-hub/errors.d.ts
index 88d0ccd1..e9daaebe 100644
--- a/packages/chaintypes/src/westend-asset-hub/errors.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -108,12 +108,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -122,47 +122,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -171,32 +171,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -205,12 +205,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -219,67 +219,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -288,33 +288,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -323,92 +323,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -417,32 +417,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -451,32 +451,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -486,152 +486,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -641,32 +641,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -674,24 +674,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s errors
@@ -700,73 +700,73 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Convert versioned location failure
      **/
-    UnsupportedLocationVersion: GenericPalletError<Rv>;
+    UnsupportedLocationVersion: GenericPalletError;
 
     /**
      * Check location failure, should start from the dispatch origin as owner
      **/
-    InvalidAssetOwner: GenericPalletError<Rv>;
+    InvalidAssetOwner: GenericPalletError;
 
     /**
      * Send xcm message failure
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * Withdraw fee asset failure
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * Convert to reanchored location failure
      **/
-    LocationConversionFailed: GenericPalletError<Rv>;
+    LocationConversionFailed: GenericPalletError;
 
     /**
      * Message export is halted
      **/
-    Halted: GenericPalletError<Rv>;
+    Halted: GenericPalletError;
 
     /**
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * The asset provided for the tip is unsupported.
      **/
-    UnsupportedAsset: GenericPalletError<Rv>;
+    UnsupportedAsset: GenericPalletError;
 
     /**
      * Unable to withdraw asset.
      **/
-    WithdrawError: GenericPalletError<Rv>;
+    WithdrawError: GenericPalletError;
 
     /**
      * Account could not be converted to a location.
      **/
-    InvalidAccount: GenericPalletError<Rv>;
+    InvalidAccount: GenericPalletError;
 
     /**
      * Provided tip asset could not be swapped for ether.
      **/
-    SwapError: GenericPalletError<Rv>;
+    SwapError: GenericPalletError;
 
     /**
      * Ether could not be burned.
      **/
-    BurnError: GenericPalletError<Rv>;
+    BurnError: GenericPalletError;
 
     /**
      * The tip provided is zero.
      **/
-    TipAmountZero: GenericPalletError<Rv>;
+    TipAmountZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -775,12 +775,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -789,78 +789,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -869,47 +869,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -918,32 +918,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Assets`'s errors
@@ -952,125 +952,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Uniques`'s errors
@@ -1079,117 +1079,117 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * The item ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The item or collection is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * There is no delegate approved.
      **/
-    NoDelegate: GenericPalletError<Rv>;
+    NoDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership of the collection is acceptable.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply has already been set.
      **/
-    MaxSupplyAlreadySet: GenericPalletError<Rv>;
+    MaxSupplyAlreadySet: GenericPalletError;
 
     /**
      * The provided max supply is less to the amount of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * No metadata is found.
      **/
-    NoMetadata: GenericPalletError<Rv>;
+    NoMetadata: GenericPalletError;
 
     /**
      * Wrong metadata key/value bytes supplied.
      **/
-    WrongMetadata: GenericPalletError<Rv>;
+    WrongMetadata: GenericPalletError;
 
     /**
      * An attribute is not found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Wrong attribute key/value bytes supplied.
      **/
-    WrongAttribute: GenericPalletError<Rv>;
+    WrongAttribute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Nfts`'s errors
@@ -1198,232 +1198,232 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownCollection: GenericPalletError<Rv>;
+    UnknownCollection: GenericPalletError;
 
     /**
      * The item ID has already been used for an item.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The approval had a deadline that expired, so the approval isn't valid anymore.
      **/
-    ApprovalExpired: GenericPalletError<Rv>;
+    ApprovalExpired: GenericPalletError;
 
     /**
      * The owner turned out to be different to what was expected.
      **/
-    WrongOwner: GenericPalletError<Rv>;
+    WrongOwner: GenericPalletError;
 
     /**
      * The witness data given does not match the current state of the chain.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Collection ID is already taken.
      **/
-    CollectionIdInUse: GenericPalletError<Rv>;
+    CollectionIdInUse: GenericPalletError;
 
     /**
      * Items within that collection are non-transferable.
      **/
-    ItemsNonTransferable: GenericPalletError<Rv>;
+    ItemsNonTransferable: GenericPalletError;
 
     /**
      * The provided account is not a delegate.
      **/
-    NotDelegate: GenericPalletError<Rv>;
+    NotDelegate: GenericPalletError;
 
     /**
      * The delegate turned out to be different to what was expected.
      **/
-    WrongDelegate: GenericPalletError<Rv>;
+    WrongDelegate: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The named owner has not signed ownership acceptance of the collection.
      **/
-    Unaccepted: GenericPalletError<Rv>;
+    Unaccepted: GenericPalletError;
 
     /**
      * The item is locked (non-transferable).
      **/
-    ItemLocked: GenericPalletError<Rv>;
+    ItemLocked: GenericPalletError;
 
     /**
      * Item's attributes are locked.
      **/
-    LockedItemAttributes: GenericPalletError<Rv>;
+    LockedItemAttributes: GenericPalletError;
 
     /**
      * Collection's attributes are locked.
      **/
-    LockedCollectionAttributes: GenericPalletError<Rv>;
+    LockedCollectionAttributes: GenericPalletError;
 
     /**
      * Item's metadata is locked.
      **/
-    LockedItemMetadata: GenericPalletError<Rv>;
+    LockedItemMetadata: GenericPalletError;
 
     /**
      * Collection's metadata is locked.
      **/
-    LockedCollectionMetadata: GenericPalletError<Rv>;
+    LockedCollectionMetadata: GenericPalletError;
 
     /**
      * All items have been minted.
      **/
-    MaxSupplyReached: GenericPalletError<Rv>;
+    MaxSupplyReached: GenericPalletError;
 
     /**
      * The max supply is locked and can't be changed.
      **/
-    MaxSupplyLocked: GenericPalletError<Rv>;
+    MaxSupplyLocked: GenericPalletError;
 
     /**
      * The provided max supply is less than the number of items a collection already has.
      **/
-    MaxSupplyTooSmall: GenericPalletError<Rv>;
+    MaxSupplyTooSmall: GenericPalletError;
 
     /**
      * The given item ID is unknown.
      **/
-    UnknownItem: GenericPalletError<Rv>;
+    UnknownItem: GenericPalletError;
 
     /**
      * Swap doesn't exist.
      **/
-    UnknownSwap: GenericPalletError<Rv>;
+    UnknownSwap: GenericPalletError;
 
     /**
      * The given item has no metadata set.
      **/
-    MetadataNotFound: GenericPalletError<Rv>;
+    MetadataNotFound: GenericPalletError;
 
     /**
      * The provided attribute can't be found.
      **/
-    AttributeNotFound: GenericPalletError<Rv>;
+    AttributeNotFound: GenericPalletError;
 
     /**
      * Item is not for sale.
      **/
-    NotForSale: GenericPalletError<Rv>;
+    NotForSale: GenericPalletError;
 
     /**
      * The provided bid is too low.
      **/
-    BidTooLow: GenericPalletError<Rv>;
+    BidTooLow: GenericPalletError;
 
     /**
      * The item has reached its approval limit.
      **/
-    ReachedApprovalLimit: GenericPalletError<Rv>;
+    ReachedApprovalLimit: GenericPalletError;
 
     /**
      * The deadline has already expired.
      **/
-    DeadlineExpired: GenericPalletError<Rv>;
+    DeadlineExpired: GenericPalletError;
 
     /**
      * The duration provided should be less than or equal to `MaxDeadlineDuration`.
      **/
-    WrongDuration: GenericPalletError<Rv>;
+    WrongDuration: GenericPalletError;
 
     /**
      * The method is disabled by system settings.
      **/
-    MethodDisabled: GenericPalletError<Rv>;
+    MethodDisabled: GenericPalletError;
 
     /**
      * The provided setting can't be set.
      **/
-    WrongSetting: GenericPalletError<Rv>;
+    WrongSetting: GenericPalletError;
 
     /**
      * Item's config already exists and should be equal to the provided one.
      **/
-    InconsistentItemConfig: GenericPalletError<Rv>;
+    InconsistentItemConfig: GenericPalletError;
 
     /**
      * Config for a collection or an item can't be found.
      **/
-    NoConfig: GenericPalletError<Rv>;
+    NoConfig: GenericPalletError;
 
     /**
      * Some roles were not cleared.
      **/
-    RolesNotCleared: GenericPalletError<Rv>;
+    RolesNotCleared: GenericPalletError;
 
     /**
      * Mint has not started yet.
      **/
-    MintNotStarted: GenericPalletError<Rv>;
+    MintNotStarted: GenericPalletError;
 
     /**
      * Mint has already ended.
      **/
-    MintEnded: GenericPalletError<Rv>;
+    MintEnded: GenericPalletError;
 
     /**
      * The provided Item was already used for claiming.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * The provided data is incorrect.
      **/
-    IncorrectData: GenericPalletError<Rv>;
+    IncorrectData: GenericPalletError;
 
     /**
      * The extrinsic was sent by the wrong origin.
      **/
-    WrongOrigin: GenericPalletError<Rv>;
+    WrongOrigin: GenericPalletError;
 
     /**
      * The provided signature is incorrect.
      **/
-    WrongSignature: GenericPalletError<Rv>;
+    WrongSignature: GenericPalletError;
 
     /**
      * The provided metadata might be too long.
      **/
-    IncorrectMetadata: GenericPalletError<Rv>;
+    IncorrectMetadata: GenericPalletError;
 
     /**
      * Can't set more attributes per one call.
      **/
-    MaxAttributesLimitReached: GenericPalletError<Rv>;
+    MaxAttributesLimitReached: GenericPalletError;
 
     /**
      * The provided namespace isn't supported in this call.
      **/
-    WrongNamespace: GenericPalletError<Rv>;
+    WrongNamespace: GenericPalletError;
 
     /**
      * Can't delete non-empty collections.
      **/
-    CollectionNotEmpty: GenericPalletError<Rv>;
+    CollectionNotEmpty: GenericPalletError;
 
     /**
      * The witness data should be provided.
      **/
-    WitnessRequired: GenericPalletError<Rv>;
+    WitnessRequired: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ForeignAssets`'s errors
@@ -1432,125 +1432,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NftFractionalization`'s errors
@@ -1559,27 +1559,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Asset ID does not correspond to locked NFT.
      **/
-    IncorrectAssetId: GenericPalletError<Rv>;
+    IncorrectAssetId: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * NFT doesn't exist.
      **/
-    NftNotFound: GenericPalletError<Rv>;
+    NftNotFound: GenericPalletError;
 
     /**
      * NFT has not yet been fractionalised.
      **/
-    NftNotFractionalized: GenericPalletError<Rv>;
+    NftNotFractionalized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssets`'s errors
@@ -1588,125 +1588,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Account balance must be greater than or equal to the transfer amount.
      **/
-    BalanceLow: GenericPalletError<Rv>;
+    BalanceLow: GenericPalletError;
 
     /**
      * The account to alter does not exist.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * The signing account has no permission to do the operation.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The given asset ID is unknown.
      **/
-    Unknown: GenericPalletError<Rv>;
+    Unknown: GenericPalletError;
 
     /**
      * The origin account is frozen.
      **/
-    Frozen: GenericPalletError<Rv>;
+    Frozen: GenericPalletError;
 
     /**
      * The asset ID is already taken.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid witness data given.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Minimum balance should be non-zero.
      **/
-    MinBalanceZero: GenericPalletError<Rv>;
+    MinBalanceZero: GenericPalletError;
 
     /**
      * Unable to increment the consumer reference counters on the account. Either no provider
      * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one
      * fewer then the maximum number of consumers has been reached.
      **/
-    UnavailableConsumer: GenericPalletError<Rv>;
+    UnavailableConsumer: GenericPalletError;
 
     /**
      * Invalid metadata given.
      **/
-    BadMetadata: GenericPalletError<Rv>;
+    BadMetadata: GenericPalletError;
 
     /**
      * No approval exists that would allow the transfer.
      **/
-    Unapproved: GenericPalletError<Rv>;
+    Unapproved: GenericPalletError;
 
     /**
      * The source account would not survive the transfer and it needs to stay alive.
      **/
-    WouldDie: GenericPalletError<Rv>;
+    WouldDie: GenericPalletError;
 
     /**
      * The asset-account already exists.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * The asset-account doesn't have an associated deposit.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The operation would result in funds being burned.
      **/
-    WouldBurn: GenericPalletError<Rv>;
+    WouldBurn: GenericPalletError;
 
     /**
      * The asset is a live asset and is actively being used. Usually emit for operations such
      * as `start_destroy` which require the asset to be in a destroying state.
      **/
-    LiveAsset: GenericPalletError<Rv>;
+    LiveAsset: GenericPalletError;
 
     /**
      * The asset is not live, and likely being destroyed.
      **/
-    AssetNotLive: GenericPalletError<Rv>;
+    AssetNotLive: GenericPalletError;
 
     /**
      * The asset status is not the expected status.
      **/
-    IncorrectStatus: GenericPalletError<Rv>;
+    IncorrectStatus: GenericPalletError;
 
     /**
      * The asset should be frozen before the given operation.
      **/
-    NotFrozen: GenericPalletError<Rv>;
+    NotFrozen: GenericPalletError;
 
     /**
      * Callback action resulted in error
      **/
-    CallbackFailed: GenericPalletError<Rv>;
+    CallbackFailed: GenericPalletError;
 
     /**
      * The asset ID must be equal to the [`NextAssetId`].
      **/
-    BadAssetId: GenericPalletError<Rv>;
+    BadAssetId: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain freezes.
      **/
-    ContainsFreezes: GenericPalletError<Rv>;
+    ContainsFreezes: GenericPalletError;
 
     /**
      * The asset cannot be destroyed because some accounts for this asset contain holds.
      **/
-    ContainsHolds: GenericPalletError<Rv>;
+    ContainsHolds: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversion`'s errors
@@ -1715,125 +1715,125 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * Pool already exists.
      **/
-    PoolExists: GenericPalletError<Rv>;
+    PoolExists: GenericPalletError;
 
     /**
      * Desired amount can't be zero.
      **/
-    WrongDesiredAmount: GenericPalletError<Rv>;
+    WrongDesiredAmount: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountOneLessThanMinimal: GenericPalletError<Rv>;
+    AmountOneLessThanMinimal: GenericPalletError;
 
     /**
      * Provided amount should be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    AmountTwoLessThanMinimal: GenericPalletError<Rv>;
+    AmountTwoLessThanMinimal: GenericPalletError;
 
     /**
      * Reserve needs to always be greater than or equal to the existential deposit/asset's
      * minimal amount.
      **/
-    ReserveLeftLessThanMinimal: GenericPalletError<Rv>;
+    ReserveLeftLessThanMinimal: GenericPalletError;
 
     /**
      * Desired amount can't be equal to the pool reserve.
      **/
-    AmountOutTooHigh: GenericPalletError<Rv>;
+    AmountOutTooHigh: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An overflow happened.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoDepositDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoDepositDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the first token in the pair wasn't met.
      **/
-    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetOneWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * The minimal amount requirement for the second token in the pair wasn't met.
      **/
-    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError<Rv>;
+    AssetTwoWithdrawalDidNotMeetMinimum: GenericPalletError;
 
     /**
      * Optimal calculated amount is less than desired.
      **/
-    OptimalAmountLessThanDesired: GenericPalletError<Rv>;
+    OptimalAmountLessThanDesired: GenericPalletError;
 
     /**
      * Insufficient liquidity minted.
      **/
-    InsufficientLiquidityMinted: GenericPalletError<Rv>;
+    InsufficientLiquidityMinted: GenericPalletError;
 
     /**
      * Requested liquidity can't be zero.
      **/
-    ZeroLiquidity: GenericPalletError<Rv>;
+    ZeroLiquidity: GenericPalletError;
 
     /**
      * Amount can't be zero.
      **/
-    ZeroAmount: GenericPalletError<Rv>;
+    ZeroAmount: GenericPalletError;
 
     /**
      * Calculated amount out is less than provided minimum amount.
      **/
-    ProvidedMinimumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMinimumNotSufficientForSwap: GenericPalletError;
 
     /**
      * Provided maximum amount is not sufficient for swap.
      **/
-    ProvidedMaximumNotSufficientForSwap: GenericPalletError<Rv>;
+    ProvidedMaximumNotSufficientForSwap: GenericPalletError;
 
     /**
      * The provided path must consists of 2 assets at least.
      **/
-    InvalidPath: GenericPalletError<Rv>;
+    InvalidPath: GenericPalletError;
 
     /**
      * The provided path must consists of unique assets.
      **/
-    NonUniquePath: GenericPalletError<Rv>;
+    NonUniquePath: GenericPalletError;
 
     /**
      * It was not possible to get or increment the Id of the pool.
      **/
-    IncorrectPoolAssetId: GenericPalletError<Rv>;
+    IncorrectPoolAssetId: GenericPalletError;
 
     /**
      * The destination account cannot exist with the swapped funds.
      **/
-    BelowMinimum: GenericPalletError<Rv>;
+    BelowMinimum: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetsFreezer`'s errors
@@ -1842,12 +1842,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Number of freezes on an account would exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ForeignAssetsFreezer`'s errors
@@ -1856,12 +1856,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Number of freezes on an account would exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PoolAssetsFreezer`'s errors
@@ -1870,12 +1870,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Number of freezes on an account would exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Revive`'s errors
@@ -1884,122 +1884,122 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid schedule supplied, e.g. with zero weight of a basic operation.
      **/
-    InvalidSchedule: GenericPalletError<Rv>;
+    InvalidSchedule: GenericPalletError;
 
     /**
      * Invalid combination of flags supplied to `seal_call` or `seal_delegate_call`.
      **/
-    InvalidCallFlags: GenericPalletError<Rv>;
+    InvalidCallFlags: GenericPalletError;
 
     /**
      * The executed contract exhausted its gas limit.
      **/
-    OutOfGas: GenericPalletError<Rv>;
+    OutOfGas: GenericPalletError;
 
     /**
      * Performing the requested transfer failed. Probably because there isn't enough
      * free balance in the sender's account.
      **/
-    TransferFailed: GenericPalletError<Rv>;
+    TransferFailed: GenericPalletError;
 
     /**
      * Performing a call was denied because the calling depth reached the limit
      * of what is specified in the schedule.
      **/
-    MaxCallDepthReached: GenericPalletError<Rv>;
+    MaxCallDepthReached: GenericPalletError;
 
     /**
      * No contract was found at the specified address.
      **/
-    ContractNotFound: GenericPalletError<Rv>;
+    ContractNotFound: GenericPalletError;
 
     /**
      * No code could be found at the supplied code hash.
      **/
-    CodeNotFound: GenericPalletError<Rv>;
+    CodeNotFound: GenericPalletError;
 
     /**
      * No code info could be found at the supplied code hash.
      **/
-    CodeInfoNotFound: GenericPalletError<Rv>;
+    CodeInfoNotFound: GenericPalletError;
 
     /**
      * A buffer outside of sandbox memory was passed to a contract API function.
      **/
-    OutOfBounds: GenericPalletError<Rv>;
+    OutOfBounds: GenericPalletError;
 
     /**
      * Input passed to a contract API function failed to decode as expected type.
      **/
-    DecodingFailed: GenericPalletError<Rv>;
+    DecodingFailed: GenericPalletError;
 
     /**
      * Contract trapped during execution.
      **/
-    ContractTrapped: GenericPalletError<Rv>;
+    ContractTrapped: GenericPalletError;
 
     /**
      * Event body or storage item exceeds [`limits::STORAGE_BYTES`].
      **/
-    ValueTooLarge: GenericPalletError<Rv>;
+    ValueTooLarge: GenericPalletError;
 
     /**
      * Termination of a contract is not allowed while the contract is already
      * on the call stack. Can be triggered by `seal_terminate`.
      **/
-    TerminatedWhileReentrant: GenericPalletError<Rv>;
+    TerminatedWhileReentrant: GenericPalletError;
 
     /**
      * `seal_call` forwarded this contracts input. It therefore is no longer available.
      **/
-    InputForwarded: GenericPalletError<Rv>;
+    InputForwarded: GenericPalletError;
 
     /**
      * The amount of topics passed to `seal_deposit_events` exceeds the limit.
      **/
-    TooManyTopics: GenericPalletError<Rv>;
+    TooManyTopics: GenericPalletError;
 
     /**
      * A contract with the same AccountId already exists.
      **/
-    DuplicateContract: GenericPalletError<Rv>;
+    DuplicateContract: GenericPalletError;
 
     /**
      * A contract self destructed in its constructor.
      *
      * This can be triggered by a call to `seal_terminate`.
      **/
-    TerminatedInConstructor: GenericPalletError<Rv>;
+    TerminatedInConstructor: GenericPalletError;
 
     /**
      * A call tried to invoke a contract that is flagged as non-reentrant.
      **/
-    ReentranceDenied: GenericPalletError<Rv>;
+    ReentranceDenied: GenericPalletError;
 
     /**
      * A contract called into the runtime which then called back into this pallet.
      **/
-    ReenteredPallet: GenericPalletError<Rv>;
+    ReenteredPallet: GenericPalletError;
 
     /**
      * A contract attempted to invoke a state modifying API while being in read-only mode.
      **/
-    StateChangeDenied: GenericPalletError<Rv>;
+    StateChangeDenied: GenericPalletError;
 
     /**
      * Origin doesn't have enough balance to pay the required storage deposits.
      **/
-    StorageDepositNotEnoughFunds: GenericPalletError<Rv>;
+    StorageDepositNotEnoughFunds: GenericPalletError;
 
     /**
      * More storage was created than allowed by the storage deposit limit.
      **/
-    StorageDepositLimitExhausted: GenericPalletError<Rv>;
+    StorageDepositLimitExhausted: GenericPalletError;
 
     /**
      * Code removal was denied because the code is still in use by at least one contract.
      **/
-    CodeInUse: GenericPalletError<Rv>;
+    CodeInUse: GenericPalletError;
 
     /**
      * The contract ran to completion but decided to revert its storage changes.
@@ -2007,7 +2007,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
      * to determine whether a reversion has taken place.
      **/
-    ContractReverted: GenericPalletError<Rv>;
+    ContractReverted: GenericPalletError;
 
     /**
      * The contract failed to compile or is missing the correct entry points.
@@ -2015,142 +2015,142 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * A more detailed error can be found on the node console if debug messages are enabled
      * by supplying `-lruntime::revive=debug`.
      **/
-    CodeRejected: GenericPalletError<Rv>;
+    CodeRejected: GenericPalletError;
 
     /**
      * The code blob supplied is larger than [`limits::code::BLOB_BYTES`].
      **/
-    BlobTooLarge: GenericPalletError<Rv>;
+    BlobTooLarge: GenericPalletError;
 
     /**
      * The contract declares too much memory (ro + rw + stack).
      **/
-    StaticMemoryTooLarge: GenericPalletError<Rv>;
+    StaticMemoryTooLarge: GenericPalletError;
 
     /**
      * The program contains a basic block that is larger than allowed.
      **/
-    BasicBlockTooLarge: GenericPalletError<Rv>;
+    BasicBlockTooLarge: GenericPalletError;
 
     /**
      * The program contains an invalid instruction.
      **/
-    InvalidInstruction: GenericPalletError<Rv>;
+    InvalidInstruction: GenericPalletError;
 
     /**
      * The contract has reached its maximum number of delegate dependencies.
      **/
-    MaxDelegateDependenciesReached: GenericPalletError<Rv>;
+    MaxDelegateDependenciesReached: GenericPalletError;
 
     /**
      * The dependency was not found in the contract's delegate dependencies.
      **/
-    DelegateDependencyNotFound: GenericPalletError<Rv>;
+    DelegateDependencyNotFound: GenericPalletError;
 
     /**
      * The contract already depends on the given delegate dependency.
      **/
-    DelegateDependencyAlreadyExists: GenericPalletError<Rv>;
+    DelegateDependencyAlreadyExists: GenericPalletError;
 
     /**
      * Can not add a delegate dependency to the code hash of the contract itself.
      **/
-    CannotAddSelfAsDelegateDependency: GenericPalletError<Rv>;
+    CannotAddSelfAsDelegateDependency: GenericPalletError;
 
     /**
      * Can not add more data to transient storage.
      **/
-    OutOfTransientStorage: GenericPalletError<Rv>;
+    OutOfTransientStorage: GenericPalletError;
 
     /**
      * The contract tried to call a syscall which does not exist (at its current api level).
      **/
-    InvalidSyscall: GenericPalletError<Rv>;
+    InvalidSyscall: GenericPalletError;
 
     /**
      * Invalid storage flags were passed to one of the storage syscalls.
      **/
-    InvalidStorageFlags: GenericPalletError<Rv>;
+    InvalidStorageFlags: GenericPalletError;
 
     /**
      * PolkaVM failed during code execution. Probably due to a malformed program.
      **/
-    ExecutionFailed: GenericPalletError<Rv>;
+    ExecutionFailed: GenericPalletError;
 
     /**
      * Failed to convert a U256 to a Balance.
      **/
-    BalanceConversionFailed: GenericPalletError<Rv>;
+    BalanceConversionFailed: GenericPalletError;
 
     /**
      * Immutable data can only be set during deploys and only be read during calls.
      * Additionally, it is only valid to set the data once and it must not be empty.
      **/
-    InvalidImmutableAccess: GenericPalletError<Rv>;
+    InvalidImmutableAccess: GenericPalletError;
 
     /**
      * An `AccountID32` account tried to interact with the pallet without having a mapping.
      *
      * Call [`Pallet::map_account`] in order to create a mapping for the account.
      **/
-    AccountUnmapped: GenericPalletError<Rv>;
+    AccountUnmapped: GenericPalletError;
 
     /**
      * Tried to map an account that is already mapped.
      **/
-    AccountAlreadyMapped: GenericPalletError<Rv>;
+    AccountAlreadyMapped: GenericPalletError;
 
     /**
      * The transaction used to dry-run a contract is invalid.
      **/
-    InvalidGenericTransaction: GenericPalletError<Rv>;
+    InvalidGenericTransaction: GenericPalletError;
 
     /**
      * The refcount of a code either over or underflowed.
      **/
-    RefcountOverOrUnderflow: GenericPalletError<Rv>;
+    RefcountOverOrUnderflow: GenericPalletError;
 
     /**
      * Unsupported precompile address.
      **/
-    UnsupportedPrecompileAddress: GenericPalletError<Rv>;
+    UnsupportedPrecompileAddress: GenericPalletError;
 
     /**
      * The calldata exceeds [`limits::CALLDATA_BYTES`].
      **/
-    CallDataTooLarge: GenericPalletError<Rv>;
+    CallDataTooLarge: GenericPalletError;
 
     /**
      * The return data exceeds [`limits::CALLDATA_BYTES`].
      **/
-    ReturnDataTooLarge: GenericPalletError<Rv>;
+    ReturnDataTooLarge: GenericPalletError;
 
     /**
      * Invalid jump destination. Dynamic jumps points to invalid not jumpdest opcode.
      **/
-    InvalidJump: GenericPalletError<Rv>;
+    InvalidJump: GenericPalletError;
 
     /**
      * Attempting to pop a value from an empty stack.
      **/
-    StackUnderflow: GenericPalletError<Rv>;
+    StackUnderflow: GenericPalletError;
 
     /**
      * Attempting to push a value onto a full stack.
      **/
-    StackOverflow: GenericPalletError<Rv>;
+    StackOverflow: GenericPalletError;
 
     /**
      * Too much deposit was drawn from the shared txfee and deposit credit.
      *
      * This happens if the passed `gas` inside the ethereum transaction is too low.
      **/
-    TxFeeOverdraw: GenericPalletError<Rv>;
+    TxFeeOverdraw: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRewards`'s errors
@@ -2159,57 +2159,57 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The staker does not have enough tokens to perform the operation.
      **/
-    NotEnoughTokens: GenericPalletError<Rv>;
+    NotEnoughTokens: GenericPalletError;
 
     /**
      * An operation was attempted on a non-existent pool.
      **/
-    NonExistentPool: GenericPalletError<Rv>;
+    NonExistentPool: GenericPalletError;
 
     /**
      * An operation was attempted for a non-existent staker.
      **/
-    NonExistentStaker: GenericPalletError<Rv>;
+    NonExistentStaker: GenericPalletError;
 
     /**
      * An operation was attempted with a non-existent asset.
      **/
-    NonExistentAsset: GenericPalletError<Rv>;
+    NonExistentAsset: GenericPalletError;
 
     /**
      * There was an error converting a block number.
      **/
-    BlockNumberConversionError: GenericPalletError<Rv>;
+    BlockNumberConversionError: GenericPalletError;
 
     /**
      * The expiry block must be in the future.
      **/
-    ExpiryBlockMustBeInTheFuture: GenericPalletError<Rv>;
+    ExpiryBlockMustBeInTheFuture: GenericPalletError;
 
     /**
      * Insufficient funds to create the freeze.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The expiry block can be only extended.
      **/
-    ExpiryCut: GenericPalletError<Rv>;
+    ExpiryCut: GenericPalletError;
 
     /**
      * The reward rate per block can be only increased.
      **/
-    RewardRateCut: GenericPalletError<Rv>;
+    RewardRateCut: GenericPalletError;
 
     /**
      * The pool still has staked tokens or rewards.
      **/
-    NonEmptyPool: GenericPalletError<Rv>;
+    NonEmptyPool: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StateTrieMigration`'s errors
@@ -2218,7 +2218,7 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Max signed limits not respected.
      **/
-    MaxSignedLimits: GenericPalletError<Rv>;
+    MaxSignedLimits: GenericPalletError;
 
     /**
      * A key was longer than the configured maximum.
@@ -2229,32 +2229,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The value should only be increased to avoid a storage migration for the currently
      * stored [`crate::Progress::LastKey`].
      **/
-    KeyTooLong: GenericPalletError<Rv>;
+    KeyTooLong: GenericPalletError;
 
     /**
      * submitter does not have enough funds.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitness: GenericPalletError<Rv>;
+    BadWitness: GenericPalletError;
 
     /**
      * Signed migration is not allowed because the maximum limit is not set yet.
      **/
-    SignedMigrationNotAllowed: GenericPalletError<Rv>;
+    SignedMigrationNotAllowed: GenericPalletError;
 
     /**
      * Bad child root provided.
      **/
-    BadChildRoot: GenericPalletError<Rv>;
+    BadChildRoot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -2263,193 +2263,193 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record not found.
      **/
-    InvalidSlashRecord: GenericPalletError<Rv>;
+    InvalidSlashRecord: GenericPalletError;
 
     /**
      * Cannot bond, nominate or validate with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Era not yet started.
      **/
-    EraNotStarted: GenericPalletError<Rv>;
+    EraNotStarted: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Unapplied slashes in the recently concluded era is blocking this operation.
      * See `Call::apply_slash` to apply them.
      **/
-    UnappliedSlashesInPreviousEra: GenericPalletError<Rv>;
+    UnappliedSlashesInPreviousEra: GenericPalletError;
 
     /**
      * The era is not eligible for pruning.
      **/
-    EraNotPrunable: GenericPalletError<Rv>;
+    EraNotPrunable: GenericPalletError;
 
     /**
      * The slash has been cancelled and cannot be applied.
      **/
-    CancelledSlash: GenericPalletError<Rv>;
+    CancelledSlash: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -2458,44 +2458,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -2504,160 +2504,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -2668,37 +2668,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -2707,17 +2707,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -2726,17 +2726,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -2745,52 +2745,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElection`'s errors
@@ -2799,22 +2799,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Triggering the `Fallback` failed.
      **/
-    Fallback: GenericPalletError<Rv>;
+    Fallback: GenericPalletError;
 
     /**
      * Unexpected phase
      **/
-    UnexpectedPhase: GenericPalletError<Rv>;
+    UnexpectedPhase: GenericPalletError;
 
     /**
      * Snapshot was unavailable.
      **/
-    Snapshot: GenericPalletError<Rv>;
+    Snapshot: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s errors
@@ -2823,52 +2823,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The phase is not signed.
      **/
-    PhaseNotSigned: GenericPalletError<Rv>;
+    PhaseNotSigned: GenericPalletError;
 
     /**
      * The submission is a duplicate.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * The queue is full.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The page index is out of bounds.
      **/
-    BadPageIndex: GenericPalletError<Rv>;
+    BadPageIndex: GenericPalletError;
 
     /**
      * The account is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * No submission found.
      **/
-    NoSubmission: GenericPalletError<Rv>;
+    NoSubmission: GenericPalletError;
 
     /**
      * Round is not yet over.
      **/
-    RoundNotOver: GenericPalletError<Rv>;
+    RoundNotOver: GenericPalletError;
 
     /**
      * Bad witness data provided.
      **/
-    BadWitnessData: GenericPalletError<Rv>;
+    BadWitnessData: GenericPalletError;
 
     /**
      * Too many invulnerable accounts are provided,
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -2877,68 +2877,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -2947,77 +2947,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -3026,32 +3026,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -3060,63 +3060,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -3125,22 +3125,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetConversionMigration`'s errors
@@ -3149,27 +3149,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Provided asset pair is not supported for pool.
      **/
-    InvalidAssetPair: GenericPalletError<Rv>;
+    InvalidAssetPair: GenericPalletError;
 
     /**
      * The pool doesn't exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * Pool's balance cannot be zero.
      **/
-    ZeroBalance: GenericPalletError<Rv>;
+    ZeroBalance: GenericPalletError;
 
     /**
      * Indicates a partial transfer of balance to the new account during a migration.
      **/
-    PartialTransfer: GenericPalletError<Rv>;
+    PartialTransfer: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AhOps`'s errors
@@ -3178,101 +3178,101 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Either no lease deposit or already unreserved.
      **/
-    NoLeaseReserve: GenericPalletError<Rv>;
+    NoLeaseReserve: GenericPalletError;
 
     /**
      * Either no crowdloan contribution or already withdrawn.
      **/
-    NoCrowdloanContribution: GenericPalletError<Rv>;
+    NoCrowdloanContribution: GenericPalletError;
 
     /**
      * Either no crowdloan reserve or already unreserved.
      **/
-    NoCrowdloanReserve: GenericPalletError<Rv>;
+    NoCrowdloanReserve: GenericPalletError;
 
     /**
      * Failed to withdraw crowdloan contribution.
      **/
-    FailedToWithdrawCrowdloanContribution: GenericPalletError<Rv>;
+    FailedToWithdrawCrowdloanContribution: GenericPalletError;
 
     /**
      * Block number is not yet reached.
      **/
-    NotYet: GenericPalletError<Rv>;
+    NotYet: GenericPalletError;
 
     /**
      * Not all contributions are withdrawn.
      **/
-    ContributionsRemaining: GenericPalletError<Rv>;
+    ContributionsRemaining: GenericPalletError;
 
     /**
      * Passed account IDs are not matching unmigrated child and sibling accounts.
      **/
-    WrongSovereignTranslation: GenericPalletError<Rv>;
+    WrongSovereignTranslation: GenericPalletError;
 
     /**
      * The account is not a derived account.
      **/
-    WrongDerivedTranslation: GenericPalletError<Rv>;
+    WrongDerivedTranslation: GenericPalletError;
 
     /**
      * Account cannot be migrated since it is not a sovereign parachain account.
      **/
-    NotSovereign: GenericPalletError<Rv>;
+    NotSovereign: GenericPalletError;
 
     /**
      * Internal error, please bug report.
      **/
-    InternalError: GenericPalletError<Rv>;
+    InternalError: GenericPalletError;
 
     /**
      * The migrated account would get reaped in the process.
      **/
-    WouldReap: GenericPalletError<Rv>;
+    WouldReap: GenericPalletError;
 
     /**
      * Failed to put a hold on an account.
      **/
-    FailedToPutHold: GenericPalletError<Rv>;
+    FailedToPutHold: GenericPalletError;
 
     /**
      * Failed to release a hold from an account.
      **/
-    FailedToReleaseHold: GenericPalletError<Rv>;
+    FailedToReleaseHold: GenericPalletError;
 
     /**
      * Failed to thaw a frozen balance.
      **/
-    FailedToThaw: GenericPalletError<Rv>;
+    FailedToThaw: GenericPalletError;
 
     /**
      * Failed to set a freeze on an account.
      **/
-    FailedToSetFreeze: GenericPalletError<Rv>;
+    FailedToSetFreeze: GenericPalletError;
 
     /**
      * Failed to transfer a balance.
      **/
-    FailedToTransfer: GenericPalletError<Rv>;
+    FailedToTransfer: GenericPalletError;
 
     /**
      * Failed to reserve a balance.
      **/
-    FailedToReserve: GenericPalletError<Rv>;
+    FailedToReserve: GenericPalletError;
 
     /**
      * Failed to unreserve the full balance.
      **/
-    CannotUnreserve: GenericPalletError<Rv>;
+    CannotUnreserve: GenericPalletError;
 
     /**
      * The from and to accounts are identical.
      **/
-    AccountIdentical: GenericPalletError<Rv>;
+    AccountIdentical: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/events.d.ts b/packages/chaintypes/src/westend-asset-hub/events.d.ts
index c448bc9d..79d6bc50 100644
--- a/packages/chaintypes/src/westend-asset-hub/events.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type {
   DispatchError,
   AccountId32,
@@ -60,7 +60,7 @@ import type {
   ParachainsCommonPayVersionedLocatableAccount,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -68,18 +68,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -88,33 +82,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -123,7 +116,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -132,13 +125,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -147,18 +139,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -168,7 +159,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -177,7 +167,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -189,7 +179,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -208,20 +197,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -236,7 +224,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -256,7 +243,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -278,7 +264,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -298,7 +283,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -312,7 +296,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -321,22 +305,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -345,18 +329,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -366,7 +349,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -376,7 +358,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -386,7 +367,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -396,7 +376,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -407,7 +386,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -417,7 +395,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -426,12 +403,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -441,7 +418,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -456,7 +432,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -475,13 +450,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -495,7 +469,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -504,40 +478,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -546,93 +519,92 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some credit was balanced and added to the TotalIssuance.
      **/
-    MintedCredit: GenericPalletEvent<Rv, 'Balances', 'MintedCredit', { amount: bigint }>;
+    MintedCredit: GenericPalletEvent<'Balances', 'MintedCredit', { amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some debt has been dropped from the Total Issuance.
      **/
-    BurnedDebt: GenericPalletEvent<Rv, 'Balances', 'BurnedDebt', { amount: bigint }>;
+    BurnedDebt: GenericPalletEvent<'Balances', 'BurnedDebt', { amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Some balance was placed on hold.
      **/
     Held: GenericPalletEvent<
-      Rv,
       'Balances',
       'Held',
       { reason: AssetHubWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -642,7 +614,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Held balance was burned from an account.
      **/
     BurnedHeld: GenericPalletEvent<
-      Rv,
       'Balances',
       'BurnedHeld',
       { reason: AssetHubWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -652,7 +623,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A transfer of `amount` on hold from `source` to `dest` was initiated.
      **/
     TransferOnHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferOnHold',
       { reason: AssetHubWestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; amount: bigint }
@@ -662,7 +632,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The `transferred` balance is placed on hold at the `dest` account.
      **/
     TransferAndHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferAndHold',
       { reason: AssetHubWestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; transferred: bigint }
@@ -672,7 +641,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some balance was released from hold.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'Balances',
       'Released',
       { reason: AssetHubWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -681,12 +649,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -697,7 +665,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -706,7 +673,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetTxPayment`'s events
@@ -717,7 +684,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who` in an asset `asset_id`.
      **/
     AssetTxFeePaid: GenericPalletEvent<
-      Rv,
       'AssetTxPayment',
       'AssetTxFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint; assetId: StagingXcmV5Location }
@@ -726,12 +692,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A swap of the refund in native currency back to asset failed.
      **/
-    AssetRefundFailed: GenericPalletEvent<Rv, 'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
+    AssetRefundFailed: GenericPalletEvent<'AssetTxPayment', 'AssetRefundFailed', { nativeAmountKept: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -740,28 +706,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -771,7 +732,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -780,18 +740,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -800,13 +759,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -816,7 +774,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -825,13 +782,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -842,7 +798,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -851,7 +806,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -861,28 +816,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -891,12 +846,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -905,13 +860,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -926,7 +880,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -941,7 +894,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -953,7 +905,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -964,7 +915,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -975,7 +925,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -987,7 +936,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -1004,7 +952,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1016,7 +963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -1028,7 +974,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -1044,7 +989,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1053,13 +997,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1071,7 +1014,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1082,7 +1024,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -1093,7 +1034,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -1104,7 +1044,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -1120,7 +1059,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -1132,7 +1070,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -1148,7 +1085,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1158,7 +1094,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1169,7 +1104,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -1179,7 +1113,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -1189,7 +1122,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -1198,14 +1130,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -1215,7 +1146,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -1225,7 +1155,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -1234,7 +1163,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -1244,29 +1173,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ToRococoXcmRouter`'s events
@@ -1276,7 +1200,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been decreased.
      **/
     DeliveryFeeFactorDecreased: GenericPalletEvent<
-      Rv,
       'ToRococoXcmRouter',
       'DeliveryFeeFactorDecreased',
       {
@@ -1291,7 +1214,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Delivery fee factor has been increased.
      **/
     DeliveryFeeFactorIncreased: GenericPalletEvent<
-      Rv,
       'ToRococoXcmRouter',
       'DeliveryFeeFactorIncreased',
       {
@@ -1305,7 +1227,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -1315,7 +1237,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -1343,7 +1264,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -1378,7 +1298,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -1408,7 +1327,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -1427,7 +1345,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s events
@@ -1437,7 +1355,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM was sent
      **/
     MessageSent: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'MessageSent',
       {
@@ -1452,7 +1369,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set OperatingMode
      **/
     ExportOperatingModeChanged: GenericPalletEvent<
-      Rv,
       'SnowbridgeSystemFrontend',
       'ExportOperatingModeChanged',
       { mode: SnowbridgeCoreOperatingModeBasicOperatingMode }
@@ -1461,7 +1377,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -1471,47 +1387,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1521,7 +1437,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1531,7 +1446,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1541,7 +1455,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1557,7 +1470,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1567,7 +1479,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1576,7 +1487,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1585,14 +1496,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1609,7 +1519,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       {
@@ -1623,13 +1532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubWestendRuntimeProxyType; delay: number }
@@ -1639,7 +1547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: AssetHubWestendRuntimeProxyType; delay: number }
@@ -1649,7 +1556,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1658,7 +1564,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -1667,23 +1573,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -1692,7 +1597,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Assets`'s events
@@ -1701,18 +1606,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<Rv, 'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
+    Created: GenericPalletEvent<'Assets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'Assets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Assets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -1721,13 +1625,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'Assets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1736,33 +1639,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Assets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'Assets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'Assets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'Assets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'Assets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'Assets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'Assets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -1772,7 +1674,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -1781,23 +1682,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'Assets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'Assets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Assets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'Assets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Assets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Assets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -1806,13 +1706,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Assets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'Assets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -1822,7 +1721,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Assets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -1833,7 +1731,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'Assets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -1842,13 +1739,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'Assets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'Assets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'Assets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -1857,27 +1753,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<Rv, 'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
+    Touched: GenericPalletEvent<'Assets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'Assets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'Assets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Assets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Uniques`'s events
@@ -1886,33 +1782,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Uniques', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Uniques', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Uniques', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Uniques', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Uniques', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Uniques',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -1921,38 +1811,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Uniques', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * Some `item` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Uniques', 'Frozen', { collection: number; item: number }>;
+    Frozen: GenericPalletEvent<'Uniques', 'Frozen', { collection: number; item: number }>;
 
     /**
      * Some `item` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Uniques', 'Thawed', { collection: number; item: number }>;
+    Thawed: GenericPalletEvent<'Uniques', 'Thawed', { collection: number; item: number }>;
 
     /**
      * Some `collection` was frozen.
      **/
-    CollectionFrozen: GenericPalletEvent<Rv, 'Uniques', 'CollectionFrozen', { collection: number }>;
+    CollectionFrozen: GenericPalletEvent<'Uniques', 'CollectionFrozen', { collection: number }>;
 
     /**
      * Some `collection` was thawed.
      **/
-    CollectionThawed: GenericPalletEvent<Rv, 'Uniques', 'CollectionThawed', { collection: number }>;
+    CollectionThawed: GenericPalletEvent<'Uniques', 'CollectionThawed', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Uniques', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'TeamChanged',
       { collection: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -1963,7 +1852,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovedTransfer',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1974,7 +1862,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -1983,13 +1870,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its attributes changed by the `Force` origin.
      **/
-    ItemStatusChanged: GenericPalletEvent<Rv, 'Uniques', 'ItemStatusChanged', { collection: number }>;
+    ItemStatusChanged: GenericPalletEvent<'Uniques', 'ItemStatusChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
     CollectionMetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMetadataSet',
       { collection: number; data: Bytes; isFrozen: boolean }
@@ -1998,13 +1884,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Uniques', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'MetadataSet',
       { collection: number; item: number; data: Bytes; isFrozen: boolean }
@@ -2013,23 +1898,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an item.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'Uniques', 'MetadataCleared', { collection: number; item: number }>;
+    MetadataCleared: GenericPalletEvent<'Uniques', 'MetadataCleared', { collection: number; item: number }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    Redeposited: GenericPalletEvent<
-      Rv,
-      'Uniques',
-      'Redeposited',
-      { collection: number; successfulItems: Array<number> }
-    >;
+    Redeposited: GenericPalletEvent<'Uniques', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeSet',
       { collection: number; maybeItem?: number | undefined; key: Bytes; value: Bytes }
@@ -2039,7 +1918,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Uniques',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes }
@@ -2049,7 +1927,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Uniques',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2059,7 +1936,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2069,7 +1945,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the instance.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2078,13 +1953,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the instance was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Uniques', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Uniques',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2093,7 +1967,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Nfts`'s events
@@ -2102,33 +1976,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'Created',
-      { collection: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'Nfts', 'Created', { collection: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * A `collection` was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'Nfts', 'ForceCreated', { collection: number; owner: AccountId32 }>;
 
     /**
      * A `collection` was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'Nfts', 'Destroyed', { collection: number }>;
+    Destroyed: GenericPalletEvent<'Nfts', 'Destroyed', { collection: number }>;
 
     /**
      * An `item` was issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
+    Issued: GenericPalletEvent<'Nfts', 'Issued', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` was transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'Nfts',
       'Transferred',
       { collection: number; item: number; from: AccountId32; to: AccountId32 }
@@ -2137,23 +2005,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An `item` was destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
+    Burned: GenericPalletEvent<'Nfts', 'Burned', { collection: number; item: number; owner: AccountId32 }>;
 
     /**
      * An `item` became non-transferable.
      **/
-    ItemTransferLocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
+    ItemTransferLocked: GenericPalletEvent<'Nfts', 'ItemTransferLocked', { collection: number; item: number }>;
 
     /**
      * An `item` became transferable.
      **/
-    ItemTransferUnlocked: GenericPalletEvent<Rv, 'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
+    ItemTransferUnlocked: GenericPalletEvent<'Nfts', 'ItemTransferUnlocked', { collection: number; item: number }>;
 
     /**
      * `item` metadata or attributes were locked.
      **/
     ItemPropertiesLocked: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPropertiesLocked',
       { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean }
@@ -2162,18 +2029,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some `collection` was locked.
      **/
-    CollectionLocked: GenericPalletEvent<Rv, 'Nfts', 'CollectionLocked', { collection: number }>;
+    CollectionLocked: GenericPalletEvent<'Nfts', 'CollectionLocked', { collection: number }>;
 
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'Nfts', 'OwnerChanged', { collection: number; newOwner: AccountId32 }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TeamChanged',
       {
@@ -2189,7 +2055,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * a `delegate`.
      **/
     TransferApproved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TransferApproved',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32; deadline?: number | undefined }
@@ -2200,7 +2065,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `collection` was cancelled by its `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ApprovalCancelled',
       { collection: number; item: number; owner: AccountId32; delegate: AccountId32 }
@@ -2210,7 +2074,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * All approvals of an item got cancelled.
      **/
     AllApprovalsCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AllApprovalsCancelled',
       { collection: number; item: number; owner: AccountId32 }
@@ -2219,43 +2082,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A `collection` has had its config changed by the `Force` origin.
      **/
-    CollectionConfigChanged: GenericPalletEvent<Rv, 'Nfts', 'CollectionConfigChanged', { collection: number }>;
+    CollectionConfigChanged: GenericPalletEvent<'Nfts', 'CollectionConfigChanged', { collection: number }>;
 
     /**
      * New metadata has been set for a `collection`.
      **/
-    CollectionMetadataSet: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
+    CollectionMetadataSet: GenericPalletEvent<'Nfts', 'CollectionMetadataSet', { collection: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for a `collection`.
      **/
-    CollectionMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'CollectionMetadataCleared', { collection: number }>;
+    CollectionMetadataCleared: GenericPalletEvent<'Nfts', 'CollectionMetadataCleared', { collection: number }>;
 
     /**
      * New metadata has been set for an item.
      **/
-    ItemMetadataSet: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'ItemMetadataSet',
-      { collection: number; item: number; data: Bytes }
-    >;
+    ItemMetadataSet: GenericPalletEvent<'Nfts', 'ItemMetadataSet', { collection: number; item: number; data: Bytes }>;
 
     /**
      * Metadata has been cleared for an item.
      **/
-    ItemMetadataCleared: GenericPalletEvent<Rv, 'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
+    ItemMetadataCleared: GenericPalletEvent<'Nfts', 'ItemMetadataCleared', { collection: number; item: number }>;
 
     /**
      * The deposit for a set of `item`s within a `collection` has been updated.
      **/
-    Redeposited: GenericPalletEvent<Rv, 'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
+    Redeposited: GenericPalletEvent<'Nfts', 'Redeposited', { collection: number; successfulItems: Array<number> }>;
 
     /**
      * New attribute metadata has been set for a `collection` or `item`.
      **/
     AttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeSet',
       {
@@ -2271,7 +2128,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Attribute metadata has been cleared for a `collection` or `item`.
      **/
     AttributeCleared: GenericPalletEvent<
-      Rv,
       'Nfts',
       'AttributeCleared',
       { collection: number; maybeItem?: number | undefined; key: Bytes; namespace: PalletNftsAttributeNamespace }
@@ -2281,7 +2137,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was added.
      **/
     ItemAttributesApprovalAdded: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalAdded',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2291,7 +2146,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new approval to modify item attributes was removed.
      **/
     ItemAttributesApprovalRemoved: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemAttributesApprovalRemoved',
       { collection: number; item: number; delegate: AccountId32 }
@@ -2301,7 +2155,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Ownership acceptance has changed for an account.
      **/
     OwnershipAcceptanceChanged: GenericPalletEvent<
-      Rv,
       'Nfts',
       'OwnershipAcceptanceChanged',
       { who: AccountId32; maybeCollection?: number | undefined }
@@ -2311,7 +2164,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Max supply has been set for a collection.
      **/
     CollectionMaxSupplySet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'CollectionMaxSupplySet',
       { collection: number; maxSupply: number }
@@ -2320,18 +2172,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Mint settings for a collection had changed.
      **/
-    CollectionMintSettingsUpdated: GenericPalletEvent<
-      Rv,
-      'Nfts',
-      'CollectionMintSettingsUpdated',
-      { collection: number }
-    >;
+    CollectionMintSettingsUpdated: GenericPalletEvent<'Nfts', 'CollectionMintSettingsUpdated', { collection: number }>;
 
     /**
      * Event gets emitted when the `NextCollectionId` gets incremented.
      **/
     NextCollectionIdIncremented: GenericPalletEvent<
-      Rv,
       'Nfts',
       'NextCollectionIdIncremented',
       { nextId?: number | undefined }
@@ -2341,7 +2187,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The price was set for the item.
      **/
     ItemPriceSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemPriceSet',
       { collection: number; item: number; price: bigint; whitelistedBuyer?: AccountId32 | undefined }
@@ -2350,13 +2195,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The price for the item was removed.
      **/
-    ItemPriceRemoved: GenericPalletEvent<Rv, 'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
+    ItemPriceRemoved: GenericPalletEvent<'Nfts', 'ItemPriceRemoved', { collection: number; item: number }>;
 
     /**
      * An item was bought.
      **/
     ItemBought: GenericPalletEvent<
-      Rv,
       'Nfts',
       'ItemBought',
       { collection: number; item: number; price: bigint; seller: AccountId32; buyer: AccountId32 }
@@ -2366,7 +2210,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A tip was sent.
      **/
     TipSent: GenericPalletEvent<
-      Rv,
       'Nfts',
       'TipSent',
       { collection: number; item: number; sender: AccountId32; receiver: AccountId32; amount: bigint }
@@ -2376,7 +2219,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An `item` swap intent was created.
      **/
     SwapCreated: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCreated',
       {
@@ -2393,7 +2235,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap was cancelled.
      **/
     SwapCancelled: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapCancelled',
       {
@@ -2410,7 +2251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The swap has been claimed.
      **/
     SwapClaimed: GenericPalletEvent<
-      Rv,
       'Nfts',
       'SwapClaimed',
       {
@@ -2429,7 +2269,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New attributes have been set for an `item` of the `collection`.
      **/
     PreSignedAttributesSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PreSignedAttributesSet',
       { collection: number; item: number; namespace: PalletNftsAttributeNamespace }
@@ -2440,7 +2279,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * within that `collection`.
      **/
     PalletAttributeSet: GenericPalletEvent<
-      Rv,
       'Nfts',
       'PalletAttributeSet',
       { collection: number; item?: number | undefined; attribute: PalletNftsPalletAttributes; value: Bytes }
@@ -2449,7 +2287,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ForeignAssets`'s events
@@ -2459,7 +2297,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some asset class was created.
      **/
     Created: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Created',
       { assetId: StagingXcmV5Location; creator: AccountId32; owner: AccountId32 }
@@ -2469,7 +2306,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were issued.
      **/
     Issued: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Issued',
       { assetId: StagingXcmV5Location; owner: AccountId32; amount: bigint }
@@ -2479,7 +2315,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Transferred',
       { assetId: StagingXcmV5Location; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2489,7 +2324,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were destroyed.
      **/
     Burned: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Burned',
       { assetId: StagingXcmV5Location; owner: AccountId32; balance: bigint }
@@ -2499,7 +2333,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TeamChanged',
       { assetId: StagingXcmV5Location; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2509,7 +2342,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The owner changed.
      **/
     OwnerChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'OwnerChanged',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2518,28 +2350,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'ForeignAssets', 'Frozen', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'ForeignAssets', 'Thawed', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
+    AssetFrozen: GenericPalletEvent<'ForeignAssets', 'AssetFrozen', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
+    AssetThawed: GenericPalletEvent<'ForeignAssets', 'AssetThawed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AccountsDestroyed',
       { assetId: StagingXcmV5Location; accountsDestroyed: number; accountsRemaining: number }
@@ -2549,7 +2380,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalsDestroyed',
       { assetId: StagingXcmV5Location; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2558,23 +2388,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'DestructionStarted',
-      { assetId: StagingXcmV5Location }
-    >;
+    DestructionStarted: GenericPalletEvent<'ForeignAssets', 'DestructionStarted', { assetId: StagingXcmV5Location }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
+    Destroyed: GenericPalletEvent<'ForeignAssets', 'Destroyed', { assetId: StagingXcmV5Location }>;
 
     /**
      * Some asset class was force-created.
      **/
     ForceCreated: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ForceCreated',
       { assetId: StagingXcmV5Location; owner: AccountId32 }
@@ -2584,7 +2408,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'MetadataSet',
       { assetId: StagingXcmV5Location; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2593,13 +2416,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
+    MetadataCleared: GenericPalletEvent<'ForeignAssets', 'MetadataCleared', { assetId: StagingXcmV5Location }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovedTransfer',
       { assetId: StagingXcmV5Location; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2609,7 +2431,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'ApprovalCancelled',
       { assetId: StagingXcmV5Location; owner: AccountId32; delegate: AccountId32 }
@@ -2620,7 +2441,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'TransferredApproved',
       {
@@ -2635,18 +2455,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<
-      Rv,
-      'ForeignAssets',
-      'AssetStatusChanged',
-      { assetId: StagingXcmV5Location }
-    >;
+    AssetStatusChanged: GenericPalletEvent<'ForeignAssets', 'AssetStatusChanged', { assetId: StagingXcmV5Location }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'AssetMinBalanceChanged',
       { assetId: StagingXcmV5Location; newMinBalance: bigint }
@@ -2656,7 +2470,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some account `who` was created with a deposit from `depositor`.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Touched',
       { assetId: StagingXcmV5Location; who: AccountId32; depositor: AccountId32 }
@@ -2665,13 +2478,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'ForeignAssets', 'Blocked', { assetId: StagingXcmV5Location; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
     Deposited: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Deposited',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2681,7 +2493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'ForeignAssets',
       'Withdrawn',
       { assetId: StagingXcmV5Location; who: AccountId32; amount: bigint }
@@ -2690,7 +2501,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NftFractionalization`'s events
@@ -2700,7 +2511,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully fractionalized.
      **/
     NftFractionalized: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftFractionalized',
       { nftCollection: number; nft: number; fractions: bigint; asset: number; beneficiary: AccountId32 }
@@ -2710,7 +2520,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An NFT was successfully returned back.
      **/
     NftUnified: GenericPalletEvent<
-      Rv,
       'NftFractionalization',
       'NftUnified',
       { nftCollection: number; nft: number; asset: number; beneficiary: AccountId32 }
@@ -2719,7 +2528,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssets`'s events
@@ -2728,23 +2537,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some asset class was created.
      **/
-    Created: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Created',
-      { assetId: number; creator: AccountId32; owner: AccountId32 }
-    >;
+    Created: GenericPalletEvent<'PoolAssets', 'Created', { assetId: number; creator: AccountId32; owner: AccountId32 }>;
 
     /**
      * Some assets were issued.
      **/
-    Issued: GenericPalletEvent<Rv, 'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
+    Issued: GenericPalletEvent<'PoolAssets', 'Issued', { assetId: number; owner: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were transferred.
      **/
     Transferred: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'Transferred',
       { assetId: number; from: AccountId32; to: AccountId32; amount: bigint }
@@ -2753,13 +2556,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some assets were destroyed.
      **/
-    Burned: GenericPalletEvent<Rv, 'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
+    Burned: GenericPalletEvent<'PoolAssets', 'Burned', { assetId: number; owner: AccountId32; balance: bigint }>;
 
     /**
      * The management team changed.
      **/
     TeamChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TeamChanged',
       { assetId: number; issuer: AccountId32; admin: AccountId32; freezer: AccountId32 }
@@ -2768,33 +2570,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The owner changed.
      **/
-    OwnerChanged: GenericPalletEvent<Rv, 'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
+    OwnerChanged: GenericPalletEvent<'PoolAssets', 'OwnerChanged', { assetId: number; owner: AccountId32 }>;
 
     /**
      * Some account `who` was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
+    Frozen: GenericPalletEvent<'PoolAssets', 'Frozen', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some account `who` was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
+    Thawed: GenericPalletEvent<'PoolAssets', 'Thawed', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some asset `asset_id` was frozen.
      **/
-    AssetFrozen: GenericPalletEvent<Rv, 'PoolAssets', 'AssetFrozen', { assetId: number }>;
+    AssetFrozen: GenericPalletEvent<'PoolAssets', 'AssetFrozen', { assetId: number }>;
 
     /**
      * Some asset `asset_id` was thawed.
      **/
-    AssetThawed: GenericPalletEvent<Rv, 'PoolAssets', 'AssetThawed', { assetId: number }>;
+    AssetThawed: GenericPalletEvent<'PoolAssets', 'AssetThawed', { assetId: number }>;
 
     /**
      * Accounts were destroyed for given asset.
      **/
     AccountsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AccountsDestroyed',
       { assetId: number; accountsDestroyed: number; accountsRemaining: number }
@@ -2804,7 +2605,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Approvals were destroyed for given asset.
      **/
     ApprovalsDestroyed: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalsDestroyed',
       { assetId: number; approvalsDestroyed: number; approvalsRemaining: number }
@@ -2813,23 +2613,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset class is in the process of being destroyed.
      **/
-    DestructionStarted: GenericPalletEvent<Rv, 'PoolAssets', 'DestructionStarted', { assetId: number }>;
+    DestructionStarted: GenericPalletEvent<'PoolAssets', 'DestructionStarted', { assetId: number }>;
 
     /**
      * An asset class was destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'PoolAssets', 'Destroyed', { assetId: number }>;
+    Destroyed: GenericPalletEvent<'PoolAssets', 'Destroyed', { assetId: number }>;
 
     /**
      * Some asset class was force-created.
      **/
-    ForceCreated: GenericPalletEvent<Rv, 'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
+    ForceCreated: GenericPalletEvent<'PoolAssets', 'ForceCreated', { assetId: number; owner: AccountId32 }>;
 
     /**
      * New metadata has been set for an asset.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'MetadataSet',
       { assetId: number; name: Bytes; symbol: Bytes; decimals: number; isFrozen: boolean }
@@ -2838,13 +2637,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Metadata has been cleared for an asset.
      **/
-    MetadataCleared: GenericPalletEvent<Rv, 'PoolAssets', 'MetadataCleared', { assetId: number }>;
+    MetadataCleared: GenericPalletEvent<'PoolAssets', 'MetadataCleared', { assetId: number }>;
 
     /**
      * (Additional) funds have been approved for transfer to a destination account.
      **/
     ApprovedTransfer: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovedTransfer',
       { assetId: number; source: AccountId32; delegate: AccountId32; amount: bigint }
@@ -2854,7 +2652,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An approval for account `delegate` was cancelled by `owner`.
      **/
     ApprovalCancelled: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'ApprovalCancelled',
       { assetId: number; owner: AccountId32; delegate: AccountId32 }
@@ -2865,7 +2662,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the approved `delegate`.
      **/
     TransferredApproved: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'TransferredApproved',
       { assetId: number; owner: AccountId32; delegate: AccountId32; destination: AccountId32; amount: bigint }
@@ -2874,13 +2670,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An asset has had its attributes changed by the `Force` origin.
      **/
-    AssetStatusChanged: GenericPalletEvent<Rv, 'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
+    AssetStatusChanged: GenericPalletEvent<'PoolAssets', 'AssetStatusChanged', { assetId: number }>;
 
     /**
      * The min_balance of an asset has been updated by the asset owner.
      **/
     AssetMinBalanceChanged: GenericPalletEvent<
-      Rv,
       'PoolAssets',
       'AssetMinBalanceChanged',
       { assetId: number; newMinBalance: bigint }
@@ -2889,32 +2684,27 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account `who` was created with a deposit from `depositor`.
      **/
-    Touched: GenericPalletEvent<
-      Rv,
-      'PoolAssets',
-      'Touched',
-      { assetId: number; who: AccountId32; depositor: AccountId32 }
-    >;
+    Touched: GenericPalletEvent<'PoolAssets', 'Touched', { assetId: number; who: AccountId32; depositor: AccountId32 }>;
 
     /**
      * Some account `who` was blocked.
      **/
-    Blocked: GenericPalletEvent<Rv, 'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
+    Blocked: GenericPalletEvent<'PoolAssets', 'Blocked', { assetId: number; who: AccountId32 }>;
 
     /**
      * Some assets were deposited (e.g. for transaction fees).
      **/
-    Deposited: GenericPalletEvent<Rv, 'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
+    Deposited: GenericPalletEvent<'PoolAssets', 'Deposited', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Some assets were withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'PoolAssets', 'Withdrawn', { assetId: number; who: AccountId32; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversion`'s events
@@ -2924,7 +2714,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `CreatePool` extrinsic will create this event.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'PoolCreated',
       {
@@ -2956,7 +2745,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `AddLiquidity` extrinsic will create this event.
      **/
     LiquidityAdded: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityAdded',
       {
@@ -3001,7 +2789,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A successful call of the `RemoveLiquidity` extrinsic will create this event.
      **/
     LiquidityRemoved: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'LiquidityRemoved',
       {
@@ -3052,7 +2839,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * and `SwapTokenForExactToken` will generate this event.
      **/
     SwapExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapExecuted',
       {
@@ -3088,7 +2874,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Assets have been converted from one to another.
      **/
     SwapCreditExecuted: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'SwapCreditExecuted',
       {
@@ -3114,7 +2899,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool has been touched in order to fulfill operational requirements.
      **/
     Touched: GenericPalletEvent<
-      Rv,
       'AssetConversion',
       'Touched',
       {
@@ -3133,32 +2917,30 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetsFreezer`'s events
    **/
   assetsFreezer: {
-    Frozen: GenericPalletEvent<Rv, 'AssetsFreezer', 'Frozen', { who: AccountId32; assetId: number; amount: bigint }>;
-    Thawed: GenericPalletEvent<Rv, 'AssetsFreezer', 'Thawed', { who: AccountId32; assetId: number; amount: bigint }>;
+    Frozen: GenericPalletEvent<'AssetsFreezer', 'Frozen', { who: AccountId32; assetId: number; amount: bigint }>;
+    Thawed: GenericPalletEvent<'AssetsFreezer', 'Thawed', { who: AccountId32; assetId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ForeignAssetsFreezer`'s events
    **/
   foreignAssetsFreezer: {
     Frozen: GenericPalletEvent<
-      Rv,
       'ForeignAssetsFreezer',
       'Frozen',
       { who: AccountId32; assetId: StagingXcmV5Location; amount: bigint }
     >;
     Thawed: GenericPalletEvent<
-      Rv,
       'ForeignAssetsFreezer',
       'Thawed',
       { who: AccountId32; assetId: StagingXcmV5Location; amount: bigint }
@@ -3167,29 +2949,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PoolAssetsFreezer`'s events
    **/
   poolAssetsFreezer: {
-    Frozen: GenericPalletEvent<
-      Rv,
-      'PoolAssetsFreezer',
-      'Frozen',
-      { who: AccountId32; assetId: number; amount: bigint }
-    >;
-    Thawed: GenericPalletEvent<
-      Rv,
-      'PoolAssetsFreezer',
-      'Thawed',
-      { who: AccountId32; assetId: number; amount: bigint }
-    >;
+    Frozen: GenericPalletEvent<'PoolAssetsFreezer', 'Frozen', { who: AccountId32; assetId: number; amount: bigint }>;
+    Thawed: GenericPalletEvent<'PoolAssetsFreezer', 'Thawed', { who: AccountId32; assetId: number; amount: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Revive`'s events
@@ -3199,7 +2971,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A custom event emitted by the contract.
      **/
     ContractEmitted: GenericPalletEvent<
-      Rv,
       'Revive',
       'ContractEmitted',
       {
@@ -3225,7 +2996,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Contract deployed by deployer at the specified address.
      **/
-    Instantiated: GenericPalletEvent<Rv, 'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
+    Instantiated: GenericPalletEvent<'Revive', 'Instantiated', { deployer: H160; contract: H160 }>;
 
     /**
      * Emitted when an Ethereum transaction reverts.
@@ -3235,12 +3006,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * To distinguish reverted calls from successful ones, this event is emitted
      * for failed Ethereum transactions.
      **/
-    EthExtrinsicRevert: GenericPalletEvent<Rv, 'Revive', 'EthExtrinsicRevert', { dispatchError: DispatchError }>;
+    EthExtrinsicRevert: GenericPalletEvent<'Revive', 'EthExtrinsicRevert', { dispatchError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRewards`'s events
@@ -3250,7 +3021,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account staked some tokens in a pool.
      **/
     Staked: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'Staked',
       {
@@ -3275,7 +3045,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account unstaked some tokens from a pool.
      **/
     Unstaked: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'Unstaked',
       {
@@ -3305,7 +3074,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account harvested some rewards.
      **/
     RewardsHarvested: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'RewardsHarvested',
       {
@@ -3335,7 +3103,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new reward pool was created.
      **/
     PoolCreated: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolCreated',
       {
@@ -3380,7 +3147,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool reward rate was modified by the admin.
      **/
     PoolRewardRateModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolRewardRateModified',
       {
@@ -3400,7 +3166,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool admin was modified.
      **/
     PoolAdminModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolAdminModified',
       {
@@ -3420,7 +3185,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool expiry block was modified by the admin.
      **/
     PoolExpiryBlockModified: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolExpiryBlockModified',
       {
@@ -3440,7 +3204,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool information was cleared after it's completion.
      **/
     PoolCleanedUp: GenericPalletEvent<
-      Rv,
       'AssetRewards',
       'PoolCleanedUp',
       {
@@ -3454,7 +3217,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StateTrieMigration`'s events
@@ -3465,7 +3228,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `compute`.
      **/
     Migrated: GenericPalletEvent<
-      Rv,
       'StateTrieMigration',
       'Migrated',
       { top: number; child: number; compute: PalletStateTrieMigrationMigrationCompute }
@@ -3474,22 +3236,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some account got slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'StateTrieMigration', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The auto migration task finished.
      **/
-    AutoMigrationFinished: GenericPalletEvent<Rv, 'StateTrieMigration', 'AutoMigrationFinished', null>;
+    AutoMigrationFinished: GenericPalletEvent<'StateTrieMigration', 'AutoMigrationFinished', null>;
 
     /**
      * Migration got halted due to an error or miss-configuration.
      **/
-    Halted: GenericPalletEvent<Rv, 'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
+    Halted: GenericPalletEvent<'StateTrieMigration', 'Halted', { error: PalletStateTrieMigrationError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -3499,18 +3261,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingAsyncRewardDestination; amount: bigint }
@@ -3519,18 +3275,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -3538,40 +3289,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A subsequent event of `Withdrawn`, indicating that `stash` was fully removed from the
      * system.
      **/
-    StakerRemoved: GenericPalletEvent<Rv, 'Staking', 'StakerRemoved', { stash: AccountId32 }>;
+    StakerRemoved: GenericPalletEvent<'Staking', 'StakerRemoved', { stash: AccountId32 }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -3581,7 +3331,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingAsyncValidatorPrefs }
@@ -3590,29 +3339,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingAsyncForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * A page from a multi-page election was fetched. A number of these are followed by
@@ -3626,7 +3370,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * the overall election will continue.
      **/
     PagedElectionProceeded: GenericPalletEvent<
-      Rv,
       'Staking',
       'PagedElectionProceeded',
       { page: number; result: Result<number, number> }
@@ -3637,7 +3380,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * given era as been reported.
      **/
     OffenceReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceReported',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -3647,7 +3389,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An offence has been processed and the corresponding slash has been computed.
      **/
     SlashComputed: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashComputed',
       { offenceEra: number; slashEra: number; offender: AccountId32; page: number }
@@ -3656,7 +3397,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unapplied slash has been cancelled.
      **/
-    SlashCancelled: GenericPalletEvent<Rv, 'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
+    SlashCancelled: GenericPalletEvent<'Staking', 'SlashCancelled', { slashEra: number; validator: AccountId32 }>;
 
     /**
      * Session change has been triggered.
@@ -3665,7 +3406,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * election is ongoing.
      **/
     SessionRotated: GenericPalletEvent<
-      Rv,
       'Staking',
       'SessionRotated',
       { startingSession: number; activeEra: number; plannedEra: number }
@@ -3675,13 +3415,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Staking', 'Unexpected', PalletStakingAsyncPalletUnexpectedKind>;
 
     /**
      * An offence was reported that was too old to be processed, and thus was dropped.
      **/
     OffenceTooOld: GenericPalletEvent<
-      Rv,
       'Staking',
       'OffenceTooOld',
       { offenceEra: number; validator: AccountId32; fraction: Perbill }
@@ -3690,12 +3429,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An old era with the given index was pruned.
      **/
-    EraPruned: GenericPalletEvent<Rv, 'Staking', 'EraPruned', { index: number }>;
+    EraPruned: GenericPalletEvent<'Staking', 'EraPruned', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -3704,13 +3443,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -3719,12 +3457,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -3740,7 +3473,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -3755,7 +3487,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -3764,13 +3495,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -3784,7 +3514,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -3795,7 +3524,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -3804,13 +3532,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -3820,7 +3547,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -3830,7 +3556,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -3840,7 +3565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -3850,7 +3574,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -3860,7 +3583,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -3870,7 +3592,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -3880,7 +3601,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -3890,7 +3610,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -3899,19 +3618,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -3921,7 +3634,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -3931,7 +3643,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -3947,7 +3658,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -3956,22 +3667,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -3979,17 +3685,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -3998,17 +3704,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -4018,7 +3724,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4028,7 +3733,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4038,7 +3742,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4048,7 +3751,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -4057,7 +3759,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingRcClient`'s events
@@ -4067,7 +3769,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A said session report was received.
      **/
     SessionReportReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'SessionReportReceived',
       {
@@ -4082,7 +3783,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new offence was reported.
      **/
     OffenceReceived: GenericPalletEvent<
-      Rv,
       'StakingRcClient',
       'OffenceReceived',
       { slashSession: number; offencesCount: number }
@@ -4092,12 +3792,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Something occurred that should never happen under normal operation.
      * Logged as an event for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingRcClient', 'Unexpected', PalletStakingAsyncRcClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElection`'s events
@@ -4108,7 +3808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * values.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'MultiBlockElection',
       'PhaseTransitioned',
       {
@@ -4127,22 +3826,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Target snapshot creation failed
      **/
-    UnexpectedTargetSnapshotFailed: GenericPalletEvent<
-      Rv,
-      'MultiBlockElection',
-      'UnexpectedTargetSnapshotFailed',
-      null
-    >;
+    UnexpectedTargetSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedTargetSnapshotFailed', null>;
 
     /**
      * Voter snapshot creation failed
      **/
-    UnexpectedVoterSnapshotFailed: GenericPalletEvent<Rv, 'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
+    UnexpectedVoterSnapshotFailed: GenericPalletEvent<'MultiBlockElection', 'UnexpectedVoterSnapshotFailed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s events
@@ -4155,7 +3849,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was wrong, or the final checks of `finalize_verification` failed.
      **/
     VerificationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'VerificationFailed',
       [number, PalletElectionProviderMultiBlockVerifierFeasibilityError]
@@ -4165,13 +3858,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given page of a solution has been verified, with the given number of winners being
      * found in it.
      **/
-    Verified: GenericPalletEvent<Rv, 'MultiBlockElectionVerifier', 'Verified', [number, number]>;
+    Verified: GenericPalletEvent<'MultiBlockElectionVerifier', 'Verified', [number, number]>;
 
     /**
      * A solution with the given score has replaced our current best solution.
      **/
     Queued: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionVerifier',
       'Queued',
       [SpNposElectionsElectionScore, SpNposElectionsElectionScore | undefined]
@@ -4180,7 +3872,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s events
@@ -4190,7 +3882,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Upcoming submission has been registered for the given account, with the given score.
      **/
     Registered: GenericPalletEvent<
-      Rv,
       'MultiBlockElectionSigned',
       'Registered',
       [number, AccountId32, SpNposElectionsElectionScore]
@@ -4199,37 +3890,37 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A page of solution solution with the given index has been stored for the given account.
      **/
-    Stored: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
+    Stored: GenericPalletEvent<'MultiBlockElectionSigned', 'Stored', [number, AccountId32, number]>;
 
     /**
      * The given account has been rewarded with the given amount.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
+    Rewarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Rewarded', [number, AccountId32, bigint]>;
 
     /**
      * The given account has been slashed with the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
+    Slashed: GenericPalletEvent<'MultiBlockElectionSigned', 'Slashed', [number, AccountId32, bigint]>;
 
     /**
      * The given solution, for the given round, was ejected.
      **/
-    Ejected: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
+    Ejected: GenericPalletEvent<'MultiBlockElectionSigned', 'Ejected', [number, AccountId32]>;
 
     /**
      * The given account has been discarded.
      **/
-    Discarded: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
+    Discarded: GenericPalletEvent<'MultiBlockElectionSigned', 'Discarded', [number, AccountId32]>;
 
     /**
      * The given account has bailed.
      **/
-    Bailed: GenericPalletEvent<Rv, 'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
+    Bailed: GenericPalletEvent<'MultiBlockElectionSigned', 'Bailed', [number, AccountId32]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -4238,18 +3929,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32, number]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32, number]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', [AccountId32, number]>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', [AccountId32, number]>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote; pollIndex: number }
@@ -4259,7 +3949,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote; pollIndex: number }
@@ -4268,12 +3957,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -4283,7 +3972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -4308,7 +3996,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -4333,7 +4020,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -4358,7 +4044,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -4378,7 +4063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -4404,7 +4088,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -4415,7 +4098,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -4430,7 +4112,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -4450,7 +4131,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -4465,7 +4145,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -4485,7 +4164,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -4505,7 +4183,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -4525,7 +4202,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -4545,7 +4221,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -4570,7 +4245,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -4590,7 +4264,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -4609,16 +4282,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -4627,7 +4299,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -4636,38 +4308,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -4676,18 +4342,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -4703,47 +4363,44 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -4752,7 +4409,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetConversionMigration`'s events
@@ -4762,7 +4419,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Indicates that a pool has been migrated to the new account ID.
      **/
     MigratedToNewAccount: GenericPalletEvent<
-      Rv,
       'AssetConversionMigration',
       'MigratedToNewAccount',
       {
@@ -4786,7 +4442,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AhOps`'s events
@@ -4796,7 +4452,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some lease reserve could not be unreserved and needs manual cleanup.
      **/
     LeaseUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'LeaseUnreserveRemaining',
       { depositor: AccountId32; paraId: number; remaining: bigint }
@@ -4806,7 +4461,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some amount for a crowdloan reserve could not be unreserved and needs manual cleanup.
      **/
     CrowdloanUnreserveRemaining: GenericPalletEvent<
-      Rv,
       'AhOps',
       'CrowdloanUnreserveRemaining',
       { depositor: AccountId32; paraId: number; remaining: bigint }
@@ -4817,7 +4471,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * representation.
      **/
     SovereignMigrated: GenericPalletEvent<
-      Rv,
       'AhOps',
       'SovereignMigrated',
       {
@@ -4847,7 +4500,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An amount of fungible balance was put on hold.
      **/
     HoldPlaced: GenericPalletEvent<
-      Rv,
       'AhOps',
       'HoldPlaced',
       { account: AccountId32; amount: bigint; reason: AssetHubWestendRuntimeRuntimeHoldReason }
@@ -4857,7 +4509,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An amount of fungible balance was released from its hold.
      **/
     HoldReleased: GenericPalletEvent<
-      Rv,
       'AhOps',
       'HoldReleased',
       { account: AccountId32; amount: bigint; reason: AssetHubWestendRuntimeRuntimeHoldReason }
@@ -4866,6 +4517,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/index.d.ts b/packages/chaintypes/src/westend-asset-hub/index.d.ts
index 1ca7286c..9075fdaa 100644
--- a/packages/chaintypes/src/westend-asset-hub/index.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   AssetHubWestendRuntimeRuntimeCall,
@@ -16,6 +16,7 @@ import type {
   PalletAssetConversionTxPaymentChargeAssetTxPayment,
   FrameMetadataHashExtensionCheckMetadataHash,
   PalletReviveEvmTxExtensionSetOrigin,
+  StagingXcmV5Location,
 } from './types.js';
 import { ChainConsts } from './consts.js';
 import { ChainStorage } from './query.js';
@@ -46,26 +47,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletReviveEvmTxExtensionSetOrigin,
     [],
   ];
-}
-
-export interface VersionedWestendAssetHubApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: StagingXcmV5Location;
 }
 
 /**
  * @name: WestendAssetHubApi
  * @specVersion: 1020005
  **/
-export interface WestendAssetHubApi {
-  legacy: VersionedWestendAssetHubApi<RpcLegacy>;
-  v2: VersionedWestendAssetHubApi<RpcV2>;
+export interface WestendAssetHubApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/json-rpc.d.ts b/packages/chaintypes/src/westend-asset-hub/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/westend-asset-hub/json-rpc.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/westend-asset-hub/query.d.ts b/packages/chaintypes/src/westend-asset-hub/query.d.ts
index ff8402d2..46726e9e 100644
--- a/packages/chaintypes/src/westend-asset-hub/query.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -145,7 +145,7 @@ import type {
   PolkadotRuntimeCommonImplsVersionedLocatableAsset,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -156,35 +156,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -192,7 +192,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -200,28 +200,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -234,14 +234,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -258,21 +258,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -280,21 +280,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -307,12 +307,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -328,7 +328,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -338,7 +338,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -352,7 +351,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -363,7 +362,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -372,14 +371,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV9PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV9PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV9PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -388,7 +387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -401,7 +400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV9UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV9UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV9UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -412,7 +411,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV9UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV9UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV9UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -424,7 +423,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -438,7 +437,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -452,7 +450,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV9AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV9AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV9AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -462,7 +460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -473,7 +471,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -484,7 +481,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -494,7 +491,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -503,7 +499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -513,7 +509,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -524,7 +519,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -533,21 +528,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -555,7 +550,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -563,7 +558,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -571,7 +566,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -580,12 +575,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -596,7 +591,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -606,12 +601,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -621,12 +616,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -639,7 +634,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -650,12 +645,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -669,7 +664,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -677,19 +672,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -700,7 +695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -708,7 +703,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -716,11 +711,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -731,12 +722,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -747,12 +738,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -763,14 +754,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -801,7 +792,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -812,7 +803,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -822,7 +813,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -830,7 +821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -839,7 +830,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -847,7 +837,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -857,13 +847,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * The `OnChargeTransaction` stores the withdrawn tx fee here.
@@ -872,12 +862,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FrameSupportStorageNoDrop | undefined> =} callback
      **/
-    txPaymentCredit: GenericStorageQuery<Rv, () => FrameSupportStorageNoDrop | undefined>;
+    txPaymentCredit: GenericStorageQuery<() => FrameSupportStorageNoDrop | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -889,11 +879,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -902,12 +888,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -918,12 +904,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -934,7 +920,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -945,7 +931,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -953,7 +939,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -962,7 +948,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -971,12 +957,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -987,14 +973,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1002,7 +988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1010,7 +996,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AssetHubWestendRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubWestendRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubWestendRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1021,7 +1007,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1029,11 +1015,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AssetHubWestendRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => AssetHubWestendRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AssetHubWestendRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1042,7 +1024,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1050,7 +1031,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1061,7 +1042,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1070,12 +1051,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1090,7 +1071,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -1100,12 +1081,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1123,7 +1104,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1135,7 +1116,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1144,7 +1125,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1156,7 +1136,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1166,14 +1145,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1182,7 +1161,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1190,7 +1168,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1201,7 +1179,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1209,7 +1187,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1220,7 +1198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1228,7 +1206,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1237,7 +1215,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1249,7 +1226,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1262,7 +1238,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1274,14 +1249,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1290,7 +1265,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1302,7 +1276,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1312,7 +1285,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1325,7 +1298,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1337,7 +1310,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1348,7 +1321,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1356,7 +1328,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ToRococoXcmRouter`'s storage queries
@@ -1373,12 +1345,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
+    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1391,7 +1363,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1401,7 +1372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1410,7 +1381,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1418,7 +1388,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s storage queries
@@ -1429,12 +1399,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SnowbridgeCoreOperatingModeBasicOperatingMode> =} callback
      **/
-    exportOperatingMode: GenericStorageQuery<Rv, () => SnowbridgeCoreOperatingModeBasicOperatingMode>;
+    exportOperatingMode: GenericStorageQuery<() => SnowbridgeCoreOperatingModeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1447,7 +1417,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1455,7 +1424,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1468,11 +1437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1480,16 +1445,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -1501,12 +1462,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1518,7 +1479,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1527,7 +1488,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1541,7 +1501,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1552,7 +1511,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1567,12 +1526,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1584,7 +1543,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1592,7 +1551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1602,7 +1561,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1614,7 +1572,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1622,7 +1580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1630,7 +1588,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1639,7 +1597,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -1651,7 +1608,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -1663,7 +1619,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1674,12 +1629,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1691,7 +1646,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1699,7 +1654,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1709,7 +1664,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1721,11 +1675,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1735,7 +1685,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -1746,7 +1695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1754,7 +1703,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1763,7 +1712,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -1775,7 +1723,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -1789,7 +1736,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1800,7 +1746,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1808,7 +1754,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1816,11 +1762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -1828,7 +1770,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1836,16 +1778,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1858,7 +1796,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
     asset: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletAssetsAssetDetails | undefined,
       StagingXcmV5Location
     >;
@@ -1870,7 +1807,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -1884,7 +1820,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [StagingXcmV5Location, AccountId32, AccountId32]
     >;
@@ -1895,7 +1830,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {StagingXcmV5Location} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
+    metadata: GenericStorageQuery<(arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1910,12 +1845,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => StagingXcmV5Location | undefined>;
+    nextAssetId: GenericStorageQuery<() => StagingXcmV5Location | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NftFractionalization`'s storage queries
@@ -1928,7 +1863,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
      **/
     nftToAsset: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftFractionalizationDetails | undefined,
       [number, number]
     >;
@@ -1936,7 +1870,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -1948,7 +1882,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1957,7 +1891,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1971,7 +1904,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1982,7 +1914,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1997,12 +1929,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -2016,7 +1948,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, StagingXcmV5Location]) => PalletAssetConversionPoolInfo | undefined,
       [StagingXcmV5Location, StagingXcmV5Location]
     >;
@@ -2027,12 +1958,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetsFreezer`'s storage queries
@@ -2045,7 +1976,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       [number, AccountId32]
     >;
@@ -2056,16 +1986,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    frozenBalances: GenericStorageQuery<
-      Rv,
-      (arg: [number, AccountId32Like]) => bigint | undefined,
-      [number, AccountId32]
-    >;
+    frozenBalances: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssetsFreezer`'s storage queries
@@ -2078,7 +2004,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -2090,7 +2015,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     frozenBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => bigint | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -2098,7 +2022,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssetsFreezer`'s storage queries
@@ -2111,7 +2035,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       [number, AccountId32]
     >;
@@ -2122,16 +2045,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    frozenBalances: GenericStorageQuery<
-      Rv,
-      (arg: [number, AccountId32Like]) => bigint | undefined,
-      [number, AccountId32]
-    >;
+    frozenBalances: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -2145,7 +2064,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -2153,7 +2072,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveVmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
 
     /**
      * The data associated to a contract or externally owned account.
@@ -2161,7 +2080,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageAccountInfo | undefined> =} callback
      **/
-    accountInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
+    accountInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -2169,7 +2088,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -2180,7 +2099,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -2188,7 +2107,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -2201,7 +2120,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * The current Ethereum block that is stored in the `on_finalize` method.
@@ -2216,7 +2135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveEvmApiRpcTypesGenBlock> =} callback
      **/
-    ethereumBlock: GenericStorageQuery<Rv, () => PalletReviveEvmApiRpcTypesGenBlock>;
+    ethereumBlock: GenericStorageQuery<() => PalletReviveEvmApiRpcTypesGenBlock>;
 
     /**
      * Mapping for block number and hashes.
@@ -2226,7 +2145,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * The details needed to reconstruct the receipt info offchain.
@@ -2238,14 +2157,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletReviveEvmBlockHashReceiptGasInfo>> =} callback
      **/
-    receiptInfoData: GenericStorageQuery<Rv, () => Array<PalletReviveEvmBlockHashReceiptGasInfo>>;
+    receiptInfoData: GenericStorageQuery<() => Array<PalletReviveEvmBlockHashReceiptGasInfo>>;
 
     /**
      * Incremental ethereum block builder.
      *
      * @param {Callback<PalletReviveEvmBlockHashBlockBuilderEthereumBlockBuilderIR> =} callback
      **/
-    ethBlockBuilderIR: GenericStorageQuery<Rv, () => PalletReviveEvmBlockHashBlockBuilderEthereumBlockBuilderIR>;
+    ethBlockBuilderIR: GenericStorageQuery<() => PalletReviveEvmBlockHashBlockBuilderEthereumBlockBuilderIR>;
 
     /**
      * The first transaction and receipt of the ethereum block.
@@ -2255,19 +2174,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[Bytes, Bytes] | undefined> =} callback
      **/
-    ethBlockBuilderFirstValues: GenericStorageQuery<Rv, () => [Bytes, Bytes] | undefined>;
+    ethBlockBuilderFirstValues: GenericStorageQuery<() => [Bytes, Bytes] | undefined>;
 
     /**
      * Debugging settings that can be configured when DebugEnabled config is true.
      *
      * @param {Callback<PalletReviveDebugDebugSettings> =} callback
      **/
-    debugSettingsOf: GenericStorageQuery<Rv, () => PalletReviveDebugDebugSettings>;
+    debugSettingsOf: GenericStorageQuery<() => PalletReviveDebugDebugSettings>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRewards`'s storage queries
@@ -2280,7 +2199,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetRewardsPoolStakerInfo | undefined> =} callback
      **/
     poolStakers: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetRewardsPoolStakerInfo | undefined,
       [number, AccountId32]
     >;
@@ -2291,7 +2209,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRewardsPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
 
     /**
      * The cost associated with storing pool information on-chain which was incurred by the pool
@@ -2303,7 +2221,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
      **/
     poolCost: GenericStorageQuery<
-      Rv,
       (arg: number) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined,
       number
     >;
@@ -2315,12 +2232,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextPoolId: GenericStorageQuery<Rv, () => number>;
+    nextPoolId: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2334,7 +2251,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -2343,7 +2260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -2352,12 +2269,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -2368,7 +2285,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -2377,7 +2294,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -2387,28 +2304,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -2417,7 +2334,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -2429,7 +2346,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncLedgerStakingLedger | undefined> =} callback
      **/
     ledger: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingAsyncLedgerStakingLedger | undefined,
       AccountId32
     >;
@@ -2442,11 +2358,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined,
-      AccountId32
-    >;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -2456,14 +2368,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -2472,7 +2384,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -2498,18 +2410,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncNominations | undefined,
-      AccountId32
-    >;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -2522,14 +2430,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -2538,7 +2446,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current planned era index.
@@ -2548,7 +2456,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -2558,7 +2466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingAsyncActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingAsyncActiveEraInfo | undefined>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -2568,7 +2476,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -2588,7 +2496,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -2605,7 +2512,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncPalletBoundedExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => PalletStakingAsyncPalletBoundedExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -2621,7 +2527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Exposure of validator at era with the preferences of validators.
@@ -2634,7 +2540,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncValidatorPrefs,
       [number, AccountId32]
     >;
@@ -2647,7 +2552,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -2656,7 +2561,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingAsyncEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -2665,14 +2570,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingAsyncForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingAsyncForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingAsyncForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -2681,7 +2586,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -2690,7 +2595,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -2698,7 +2603,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * Stores reported offences in a queue until they are processed in subsequent blocks.
@@ -2716,7 +2621,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncSlashingOffenceRecord | undefined> =} callback
      **/
     offenceQueue: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncSlashingOffenceRecord | undefined,
       [number, AccountId32]
     >;
@@ -2736,7 +2640,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    offenceQueueEras: GenericStorageQuery<Rv, () => Array<number> | undefined>;
+    offenceQueueEras: GenericStorageQuery<() => Array<number> | undefined>;
 
     /**
      * Tracks the currently processed offence record from the `OffenceQueue`.
@@ -2755,7 +2659,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined> =} callback
      **/
     processingOffence: GenericStorageQuery<
-      Rv,
       () => [number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined
     >;
 
@@ -2766,7 +2669,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncUnappliedSlash | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, [AccountId32Like, Perbill, number]]) => PalletStakingAsyncUnappliedSlash | undefined,
       [number, [AccountId32, Perbill, number]]
     >;
@@ -2781,7 +2683,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, Perbill]>> =} callback
      **/
-    cancelledSlashes: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, Perbill]>, number>;
+    cancelledSlashes: GenericStorageQuery<(arg: number) => Array<[AccountId32, Perbill]>, number>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -2791,7 +2693,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -2803,7 +2704,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Voter snapshot progress status.
@@ -2813,7 +2714,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncSnapshotStatus> =} callback
      **/
-    voterSnapshotStatus: GenericStorageQuery<Rv, () => PalletStakingAsyncSnapshotStatus>;
+    voterSnapshotStatus: GenericStorageQuery<() => PalletStakingAsyncSnapshotStatus>;
 
     /**
      * Keeps track of an ongoing multi-page election solution request.
@@ -2825,14 +2726,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextElectionPage: GenericStorageQuery<Rv, () => number | undefined>;
+    nextElectionPage: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A bounded list of the "electable" stashes that resulted from a successful election.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    electableStashes: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    electableStashes: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Tracks the current step of era pruning process for each era being lazily pruned.
@@ -2840,12 +2741,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncPalletPruningStep | undefined> =} callback
      **/
-    eraPruningState: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
+    eraPruningState: GenericStorageQuery<(arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -2860,14 +2761,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2880,7 +2781,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2888,7 +2789,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2896,7 +2797,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2904,7 +2805,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2913,7 +2814,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2924,7 +2825,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2934,7 +2834,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2942,14 +2842,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2958,14 +2858,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2974,14 +2874,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2989,21 +2889,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -3014,14 +2914,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -3029,16 +2929,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -3051,7 +2947,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -3061,14 +2957,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -3082,12 +2978,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -3101,14 +2997,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -3118,7 +3014,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -3126,7 +3022,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -3136,7 +3032,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Accounts that failed to be inserted into the bags-list due to locking.
@@ -3157,19 +3053,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pendingRebag: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    pendingRebag: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingRebag: GenericStorageQuery<Rv, () => number>;
+    counterForPendingRebag: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -3185,7 +3081,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -3195,7 +3090,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -3203,23 +3098,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRcClient`'s storage queries
@@ -3230,7 +3121,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncRcClientSessionReport | undefined> =} callback
      **/
-    incompleteSessionReport: GenericStorageQuery<Rv, () => PalletStakingAsyncRcClientSessionReport | undefined>;
+    incompleteSessionReport: GenericStorageQuery<() => PalletStakingAsyncRcClientSessionReport | undefined>;
 
     /**
      * The last session report's `end_index` that we have acted upon.
@@ -3244,7 +3135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSessionReportEndingIndex: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSessionReportEndingIndex: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A validator set that is outgoing, and should be sent.
@@ -3254,15 +3145,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientValidatorSetReport, number] | undefined> =} callback
      **/
-    outgoingValidatorSet: GenericStorageQuery<
-      Rv,
-      () => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined
-    >;
+    outgoingValidatorSet: GenericStorageQuery<() => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElection`'s storage queries
@@ -3278,14 +3166,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiBlockPhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockPhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiBlockPhase>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -3293,7 +3181,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    desiredTargets: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Paginated voter snapshot. At most [`T::Pages`] keys will exist.
@@ -3302,7 +3190,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint, Array<AccountId32>]> | undefined> =} callback
      **/
     pagedVoterSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<[AccountId32, bigint, Array<AccountId32>]> | undefined,
       [number, number]
     >;
@@ -3315,7 +3202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedVoterSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedVoterSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Paginated target snapshot.
@@ -3326,7 +3213,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
     pagedTargetSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<AccountId32> | undefined,
       [number, number]
     >;
@@ -3339,12 +3225,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedTargetSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedTargetSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s storage queries
@@ -3363,7 +3249,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionX: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -3375,7 +3260,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionY: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -3388,7 +3272,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsValidSolution> =} callback
      **/
     queuedValidVariant: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiBlockVerifierImplsValidSolution,
       number
     >;
@@ -3407,7 +3290,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined> =} callback
      **/
     queuedSolutionBackings: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number],
       ) => Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined,
@@ -3422,26 +3304,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    queuedSolutionScore: GenericStorageQuery<Rv, (arg: number) => SpNposElectionsElectionScore | undefined, number>;
+    queuedSolutionScore: GenericStorageQuery<(arg: number) => SpNposElectionsElectionScore | undefined, number>;
 
     /**
      * The minimum score that each solution must attain in order to be considered feasible.
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Storage item for [`Status`].
      *
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsStatus> =} callback
      **/
-    statusStorage: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockVerifierImplsStatus>;
+    statusStorage: GenericStorageQuery<() => PalletElectionProviderMultiBlockVerifierImplsStatus>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s storage queries
@@ -3460,14 +3342,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, SpNposElectionsElectionScore]>> =} callback
      **/
-    sortedScores: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
+    sortedScores: GenericStorageQuery<(arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
 
     /**
      * Triple map from (round, account, page) to a solution page.
@@ -3476,7 +3358,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubWestendRuntimeStakingNposCompactSolution16 | undefined> =} callback
      **/
     submissionStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => AssetHubWestendRuntimeStakingNposCompactSolution16 | undefined,
       [number, AccountId32, number]
     >;
@@ -3491,7 +3372,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined> =} callback
      **/
     submissionMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3499,7 +3379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -3513,7 +3393,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -3526,12 +3405,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -3542,7 +3421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3550,7 +3429,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -3561,7 +3440,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3569,7 +3448,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -3582,12 +3461,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -3598,12 +3477,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -3617,7 +3496,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -3628,14 +3507,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -3645,14 +3524,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -3660,19 +3539,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3687,7 +3566,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3695,7 +3573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhOps`'s storage queries
@@ -3721,7 +3599,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcLeaseReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, number, AccountId32Like]) => bigint | undefined,
       [number, number, AccountId32]
     >;
@@ -3744,7 +3621,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, bigint] | undefined> =} callback
      **/
     rcCrowdloanContribution: GenericStorageQuery<
-      Rv,
       (arg: [number, number, AccountId32Like]) => [AccountId32, bigint] | undefined,
       [number, number, AccountId32]
     >;
@@ -3764,7 +3640,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcCrowdloanReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, number, AccountId32Like]) => bigint | undefined,
       [number, number, AccountId32]
     >;
@@ -3772,6 +3647,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/runtime.d.ts b/packages/chaintypes/src/westend-asset-hub/runtime.d.ts
index 6b1f0478..7eb71515 100644
--- a/packages/chaintypes/src/westend-asset-hub/runtime.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -69,7 +69,7 @@ import type {
   PalletRevivePrimitivesBalanceConversionError,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -81,19 +81,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -104,12 +104,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -120,12 +120,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SlotSchedule - 0x5bfafc20876faaf0
@@ -141,12 +141,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SlotSchedule_next_slot_schedule
      * @param {number} num_cores
      **/
-    nextSlotSchedule: GenericRuntimeApiMethod<Rv, (numCores: number) => Promise<CumulusPrimitivesCoreNextSlotSchedule>>;
+    nextSlotSchedule: GenericRuntimeApiMethod<(numCores: number) => Promise<CumulusPrimitivesCoreNextSlotSchedule>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -168,12 +168,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -184,7 +184,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -192,7 +192,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlockLazyBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlockLazyBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlockLazyBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -200,12 +200,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -216,7 +216,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -227,7 +227,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -236,12 +236,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -257,7 +257,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -268,7 +267,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -277,7 +276,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -289,14 +287,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlockLazyBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -319,7 +316,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -332,7 +328,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -344,12 +340,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -367,7 +363,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -378,14 +374,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -397,12 +392,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NftsApi - 0x899a250cbe84f250
@@ -414,14 +409,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} collection
      * @param {number} item
      **/
-    owner: GenericRuntimeApiMethod<Rv, (collection: number, item: number) => Promise<AccountId32 | undefined>>;
+    owner: GenericRuntimeApiMethod<(collection: number, item: number) => Promise<AccountId32 | undefined>>;
 
     /**
      *
      * @callname: NftsApi_collection_owner
      * @param {number} collection
      **/
-    collectionOwner: GenericRuntimeApiMethod<Rv, (collection: number) => Promise<AccountId32 | undefined>>;
+    collectionOwner: GenericRuntimeApiMethod<(collection: number) => Promise<AccountId32 | undefined>>;
 
     /**
      *
@@ -431,7 +426,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     attribute: GenericRuntimeApiMethod<
-      Rv,
       (collection: number, item: number, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -444,7 +438,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     customAttribute: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like, collection: number, item: number, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -456,7 +449,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     systemAttribute: GenericRuntimeApiMethod<
-      Rv,
       (collection: number, item: number | undefined, key: BytesLike) => Promise<Bytes | undefined>
     >;
 
@@ -466,15 +458,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} collection
      * @param {BytesLike} key
      **/
-    collectionAttribute: GenericRuntimeApiMethod<
-      Rv,
-      (collection: number, key: BytesLike) => Promise<Bytes | undefined>
-    >;
+    collectionAttribute: GenericRuntimeApiMethod<(collection: number, key: BytesLike) => Promise<Bytes | undefined>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetConversionApi - 0x8a8047a53a8277ec
@@ -493,7 +482,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceTokensForExactTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -515,7 +503,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {boolean} include_fee
      **/
     quotePriceExactTokensForTokens: GenericRuntimeApiMethod<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -532,14 +519,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {StagingXcmV5Location} asset2
      **/
     getReserves: GenericRuntimeApiMethod<
-      Rv,
       (asset1: StagingXcmV5Location, asset2: StagingXcmV5Location) => Promise<[bigint, bigint] | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -552,7 +538,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -563,7 +548,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -572,19 +556,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -601,7 +585,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -616,7 +599,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -633,7 +615,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -652,7 +633,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -662,7 +642,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -677,7 +657,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AssetHubWestendRuntimeOriginCaller,
         call: AssetHubWestendRuntimeRuntimeCallLike,
@@ -693,7 +672,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -703,7 +681,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -716,14 +694,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -741,7 +718,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -760,7 +736,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -770,7 +745,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -783,7 +758,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -797,7 +771,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -807,7 +780,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -821,7 +794,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -833,7 +805,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -843,7 +814,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -851,12 +822,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: FungiblesApi - 0xde92b8a0426b9bf6
@@ -869,14 +840,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {AccountId32Like} account
      **/
     queryAccountBalances: GenericRuntimeApiMethod<
-      Rv,
       (account: AccountId32Like) => Promise<Result<XcmVersionedAssets, AssetsCommonRuntimeApiFungiblesAccessError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -891,12 +861,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AssetRewards - 0x65f855d6e093c2f1
@@ -909,12 +879,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AssetRewards_pool_creation_cost
      **/
-    poolCreationCost: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    poolCreationCost: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -926,7 +896,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -935,7 +905,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -944,7 +914,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -952,7 +922,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -963,7 +933,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -978,7 +948,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -992,7 +962,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -1000,7 +970,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -1008,7 +978,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -1016,12 +986,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -1033,7 +1003,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -1042,7 +1012,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if a validator `account` has pages to be claimed for the given era.
@@ -1051,12 +1021,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1077,7 +1047,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1098,7 +1068,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1108,12 +1078,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ReviveApi - 0x8c403e5c4a9fd442
@@ -1126,7 +1096,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_eth_block
      **/
-    ethBlock: GenericRuntimeApiMethod<Rv, () => Promise<PalletReviveEvmApiRpcTypesGenBlock>>;
+    ethBlock: GenericRuntimeApiMethod<() => Promise<PalletReviveEvmApiRpcTypesGenBlock>>;
 
     /**
      * Returns the ETH block hash for the given block number.
@@ -1134,7 +1104,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_eth_block_hash
      * @param {U256} number
      **/
-    ethBlockHash: GenericRuntimeApiMethod<Rv, (number: U256) => Promise<H256 | undefined>>;
+    ethBlockHash: GenericRuntimeApiMethod<(number: U256) => Promise<H256 | undefined>>;
 
     /**
      * The details needed to reconstruct the receipt information offchain.
@@ -1145,14 +1115,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_eth_receipt_data
      **/
-    ethReceiptData: GenericRuntimeApiMethod<Rv, () => Promise<Array<PalletReviveEvmBlockHashReceiptGasInfo>>>;
+    ethReceiptData: GenericRuntimeApiMethod<() => Promise<Array<PalletReviveEvmBlockHashReceiptGasInfo>>>;
 
     /**
      * Returns the block gas limit.
      *
      * @callname: ReviveApi_block_gas_limit
      **/
-    blockGasLimit: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    blockGasLimit: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the free balance of the given `[H160]` address, using EVM decimals.
@@ -1160,14 +1130,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_balance
      * @param {H160} address
      **/
-    balance: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<U256>>;
+    balance: GenericRuntimeApiMethod<(address: H160) => Promise<U256>>;
 
     /**
      * Returns the gas price.
      *
      * @callname: ReviveApi_gas_price
      **/
-    gasPrice: GenericRuntimeApiMethod<Rv, () => Promise<U256>>;
+    gasPrice: GenericRuntimeApiMethod<() => Promise<U256>>;
 
     /**
      * Returns the nonce of the given `[H160]` address.
@@ -1175,7 +1145,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_nonce
      * @param {H160} address
      **/
-    nonce: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<number>>;
+    nonce: GenericRuntimeApiMethod<(address: H160) => Promise<number>>;
 
     /**
      * Perform a call from a specified account to a given contract.
@@ -1191,7 +1161,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input_data
      **/
     call: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         dest: H160,
@@ -1217,7 +1186,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         value: bigint,
@@ -1238,7 +1206,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiRpcTypesGenGenericTransaction} tx
      **/
     ethTransact: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
       ) => Promise<Result<PalletRevivePrimitivesEthTransactInfo, PalletRevivePrimitivesEthTransactError>>
@@ -1255,7 +1222,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {bigint | undefined} storage_deposit_limit
      **/
     uploadCode: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: AccountId32Like,
         code: BytesLike,
@@ -1275,7 +1241,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {FixedBytes<32>} key
      **/
     getStorage: GenericRuntimeApiMethod<
-      Rv,
       (
         address: H160,
         key: FixedBytes<32>,
@@ -1294,7 +1259,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} key
      **/
     getStorageVarKey: GenericRuntimeApiMethod<
-      Rv,
       (address: H160, key: BytesLike) => Promise<Result<Bytes | undefined, PalletRevivePrimitivesContractAccessError>>
     >;
 
@@ -1311,7 +1275,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceBlock: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1332,7 +1295,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceTx: GenericRuntimeApiMethod<
-      Rv,
       (
         block: SpRuntimeBlock,
         txIndex: number,
@@ -1350,7 +1312,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PalletReviveEvmApiDebugRpcTypesTracerType} config
      **/
     traceCall: GenericRuntimeApiMethod<
-      Rv,
       (
         tx: PalletReviveEvmApiRpcTypesGenGenericTransaction,
         config: PalletReviveEvmApiDebugRpcTypesTracerType,
@@ -1362,7 +1323,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ReviveApi_block_author
      **/
-    blockAuthor: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    blockAuthor: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * Get the H160 address associated to this account id
@@ -1370,7 +1331,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_address
      * @param {AccountId32Like} account_id
      **/
-    address: GenericRuntimeApiMethod<Rv, (accountId: AccountId32Like) => Promise<H160>>;
+    address: GenericRuntimeApiMethod<(accountId: AccountId32Like) => Promise<H160>>;
 
     /**
      * Get the account id associated to this H160 address.
@@ -1378,14 +1339,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_account_id
      * @param {H160} address
      **/
-    accountId: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<AccountId32>>;
+    accountId: GenericRuntimeApiMethod<(address: H160) => Promise<AccountId32>>;
 
     /**
      * The address used to call the runtime's pallets dispatchables
      *
      * @callname: ReviveApi_runtime_pallets_address
      **/
-    runtimePalletsAddress: GenericRuntimeApiMethod<Rv, () => Promise<H160>>;
+    runtimePalletsAddress: GenericRuntimeApiMethod<() => Promise<H160>>;
 
     /**
      * The code at the specified address taking pre-compiles into account.
@@ -1393,7 +1354,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ReviveApi_code
      * @param {H160} address
      **/
-    code: GenericRuntimeApiMethod<Rv, (address: H160) => Promise<Bytes>>;
+    code: GenericRuntimeApiMethod<(address: H160) => Promise<Bytes>>;
 
     /**
      * Construct the new balance and dust components of this EVM balance.
@@ -1402,13 +1363,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {U256} balance
      **/
     newBalanceWithDust: GenericRuntimeApiMethod<
-      Rv,
       (balance: U256) => Promise<Result<[bigint, number], PalletRevivePrimitivesBalanceConversionError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/tx.d.ts b/packages/chaintypes/src/westend-asset-hub/tx.d.ts
index 0e729570..f7ea30cc 100644
--- a/packages/chaintypes/src/westend-asset-hub/tx.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -98,16 +96,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = AssetHubWestendRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<AssetHubWestendRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -120,16 +120,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -139,16 +138,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -158,16 +156,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -180,16 +177,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -199,16 +195,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -218,16 +213,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -241,19 +235,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -263,16 +256,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -285,16 +277,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -311,16 +302,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -338,23 +328,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -375,12 +364,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -390,7 +377,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -399,23 +387,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -445,23 +432,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -470,7 +456,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -486,16 +472,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -512,20 +497,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -537,15 +521,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -559,23 +542,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -590,16 +572,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -614,16 +595,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -636,16 +616,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -657,16 +636,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -678,23 +656,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -709,14 +686,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -728,7 +703,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -739,19 +715,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -765,7 +740,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -773,7 +747,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -786,7 +759,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -796,16 +770,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -818,14 +791,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -837,7 +808,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -851,7 +823,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -859,7 +830,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -872,7 +842,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -895,20 +866,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -931,20 +901,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -954,16 +923,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -973,23 +941,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -1001,16 +968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1025,19 +991,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubWestendRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: AssetHubWestendRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1048,16 +1013,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1071,19 +1035,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1094,22 +1057,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -1128,19 +1090,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1153,20 +1114,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1182,19 +1142,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1219,19 +1178,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1244,19 +1202,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1273,16 +1230,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1295,19 +1251,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1322,19 +1277,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1351,26 +1305,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -1389,15 +1342,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1417,16 +1369,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1449,19 +1400,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1486,20 +1436,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1530,19 +1479,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1558,26 +1506,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -1601,16 +1548,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1624,16 +1570,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1649,16 +1594,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1670,15 +1614,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1691,15 +1634,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1712,16 +1654,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1734,16 +1675,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1759,16 +1699,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1785,26 +1724,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -1825,19 +1763,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: AssetHubWestendRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: AssetHubWestendRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1857,22 +1794,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -1885,15 +1821,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1906,15 +1841,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1928,16 +1862,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1951,16 +1884,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1974,23 +1906,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -2002,19 +1933,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2046,14 +1976,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2065,7 +1993,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2109,14 +2038,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2128,7 +2055,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2146,19 +2074,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2174,19 +2101,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2200,16 +2126,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2222,16 +2147,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2246,16 +2170,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2298,7 +2221,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2306,7 +2228,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2319,7 +2240,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2350,7 +2272,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2358,7 +2279,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2371,7 +2291,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2384,16 +2305,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2439,7 +2359,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -2447,7 +2366,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2460,7 +2378,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2476,19 +2395,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2551,7 +2469,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -2561,7 +2478,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -2576,7 +2492,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2597,19 +2514,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2620,16 +2536,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2639,22 +2554,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -2663,7 +2577,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ToRococoXcmRouter`'s transaction calls
@@ -2676,26 +2590,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isCongested
      **/
     reportBridgeStatus: GenericTxCall<
-      Rv,
       (
         bridgeId: H256,
         isCongested: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ToRococoXcmRouter';
           palletCall: {
             name: 'ReportBridgeStatus';
             params: { bridgeId: H256; isCongested: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -2708,19 +2621,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2745,14 +2657,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -2764,14 +2674,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s transaction calls
@@ -2783,16 +2694,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SnowbridgeCoreOperatingModeBasicOperatingMode} mode
      **/
     setOperatingMode: GenericTxCall<
-      Rv,
       (mode: SnowbridgeCoreOperatingModeBasicOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'SetOperatingMode';
             params: { mode: SnowbridgeCoreOperatingModeBasicOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2810,13 +2720,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} feeAsset
      **/
     registerToken: GenericTxCall<
-      Rv,
       (
         assetId: XcmVersionedLocation,
         metadata: SnowbridgeCoreAssetMetadata,
         feeAsset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
@@ -2827,7 +2735,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAsset: StagingXcmV5Asset;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2839,26 +2748,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Asset} asset
      **/
     addTip: GenericTxCall<
-      Rv,
       (
         messageId: SnowbridgeCoreRewardMessageId,
         asset: StagingXcmV5Asset,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'SnowbridgeSystemFrontend';
           palletCall: {
             name: 'AddTip';
             params: { messageId: SnowbridgeCoreRewardMessageId; asset: StagingXcmV5Asset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -2887,16 +2795,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubWestendRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<AssetHubWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2919,19 +2826,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2953,16 +2859,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubWestendRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<AssetHubWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2978,19 +2883,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubWestendRuntimeOriginCaller,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: AssetHubWestendRuntimeOriginCaller; call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3012,16 +2916,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AssetHubWestendRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<AssetHubWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<AssetHubWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3037,19 +2940,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: AssetHubWestendRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: AssetHubWestendRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3082,19 +2984,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: AssetHubWestendRuntimeRuntimeCallLike,
         fallback: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: AssetHubWestendRuntimeRuntimeCallLike; fallback: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3109,26 +3010,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: AssetHubWestendRuntimeOriginCaller,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: AssetHubWestendRuntimeOriginCaller; call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -3152,19 +3052,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3216,7 +3115,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3224,7 +3122,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: AssetHubWestendRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3237,7 +3134,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3280,7 +3178,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -3288,7 +3185,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3301,7 +3197,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3334,14 +3231,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -3353,7 +3248,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3377,27 +3273,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -3419,13 +3314,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: AssetHubWestendRuntimeProxyType | undefined,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3436,7 +3329,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3456,20 +3350,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubWestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubWestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3487,20 +3380,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: AssetHubWestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: AssetHubWestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3514,15 +3406,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3551,20 +3442,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: AssetHubWestendRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: AssetHubWestendRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3593,7 +3483,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: AssetHubWestendRuntimeProxyType,
@@ -3601,7 +3490,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3614,7 +3502,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3639,19 +3528,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3671,19 +3559,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3703,19 +3590,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3738,14 +3624,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: AssetHubWestendRuntimeProxyType | undefined,
         call: AssetHubWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -3757,7 +3641,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: AssetHubWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3773,22 +3658,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -3811,16 +3695,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3842,19 +3725,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3875,16 +3757,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3908,20 +3789,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3942,16 +3822,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3970,23 +3849,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Assets`'s transaction calls
@@ -4018,20 +3896,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4062,21 +3939,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4097,16 +3973,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4127,16 +4002,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4157,16 +4031,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4185,16 +4058,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4217,20 +4089,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4256,20 +4127,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4298,20 +4168,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4340,20 +4209,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4384,21 +4252,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4420,19 +4287,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4452,19 +4318,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4482,16 +4347,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4509,16 +4373,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4538,19 +4401,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4574,21 +4436,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4616,21 +4477,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4650,16 +4510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4686,7 +4545,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -4694,14 +4552,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4721,16 +4579,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4768,7 +4625,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -4779,7 +4635,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
@@ -4795,7 +4650,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4826,20 +4682,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4862,19 +4717,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4898,20 +4752,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4941,21 +4794,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4973,16 +4825,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5005,19 +4856,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5039,19 +4889,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5072,19 +4921,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5107,19 +4955,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5139,19 +4986,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5178,27 +5024,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Assets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Uniques`'s transaction calls
@@ -5226,19 +5071,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} admin
      **/
     create: GenericTxCall<
-      Rv,
       (
         collection: number,
         admin: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Create';
             params: { collection: number; admin: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5266,20 +5110,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeHolding
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
         freeHolding: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ForceCreate';
             params: { collection: number; owner: MultiAddressLike; freeHolding: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5304,19 +5147,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletUniquesDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletUniquesDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletUniquesDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5338,20 +5180,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Mint';
             params: { collection: number; item: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5377,20 +5218,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} checkOwner
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         checkOwner: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number; checkOwner: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5418,20 +5258,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5458,19 +5297,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5490,19 +5328,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Freeze';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5522,19 +5359,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'Thaw';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5552,16 +5388,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     freezeCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'FreezeCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5579,16 +5414,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     thawCollection: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ThawCollection';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5609,19 +5443,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5645,14 +5478,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5664,7 +5495,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5689,20 +5521,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5729,20 +5560,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeCheckDelegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         maybeCheckDelegate: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; maybeCheckDelegate: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5773,7 +5603,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceItemStatus: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
@@ -5783,7 +5612,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         freeHolding: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -5798,7 +5626,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5827,21 +5656,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike; value: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5866,20 +5694,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearAttribute';
             params: { collection: number; maybeItem: number | undefined; key: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5908,21 +5735,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5945,19 +5771,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5984,20 +5809,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6018,16 +5842,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6046,16 +5869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6076,19 +5898,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6111,14 +5932,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
@@ -6130,7 +5949,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6150,27 +5970,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Uniques';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Nfts`'s transaction calls
@@ -6197,19 +6016,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     create: GenericTxCall<
-      Rv,
       (
         admin: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Create';
             params: { admin: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6234,19 +6052,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         owner: MultiAddressLike,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCreate';
             params: { owner: MultiAddressLike; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6273,19 +6090,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsDestroyWitness} witness
      **/
     destroy: GenericTxCall<
-      Rv,
       (
         collection: number,
         witness: PalletNftsDestroyWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Destroy';
             params: { collection: number; witness: PalletNftsDestroyWitness };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6313,14 +6129,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintWitness | undefined} witnessData
      **/
     mint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         witnessData: PalletNftsMintWitness | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6332,7 +6146,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessData: PalletNftsMintWitness | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6357,21 +6172,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsItemConfig} itemConfig
      **/
     forceMint: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         mintTo: MultiAddressLike,
         itemConfig: PalletNftsItemConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceMint';
             params: { collection: number; item: number; mintTo: MultiAddressLike; itemConfig: PalletNftsItemConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6392,19 +6206,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     burn: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Burn';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6429,20 +6242,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dest
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         dest: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Transfer';
             params: { collection: number; item: number; dest: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6469,19 +6281,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} items
      **/
     redeposit: GenericTxCall<
-      Rv,
       (
         collection: number,
         items: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'Redeposit';
             params: { collection: number; items: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6501,19 +6312,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     lockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6533,19 +6343,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     unlockItemTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UnlockItemTransfer';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6567,19 +6376,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsBitFlags} lockSettings
      **/
     lockCollection: GenericTxCall<
-      Rv,
       (
         collection: number,
         lockSettings: PalletNftsBitFlags,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockCollection';
             params: { collection: number; lockSettings: PalletNftsBitFlags };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6600,19 +6408,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} newOwner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         collection: number,
         newOwner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'TransferOwnership';
             params: { collection: number; newOwner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6640,14 +6447,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         collection: number,
         issuer: MultiAddressLike | undefined,
         admin: MultiAddressLike | undefined,
         freezer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6659,7 +6464,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6679,19 +6485,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     forceCollectionOwner: GenericTxCall<
-      Rv,
       (
         collection: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionOwner';
             params: { collection: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6711,19 +6516,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCollectionConfig} config
      **/
     forceCollectionConfig: GenericTxCall<
-      Rv,
       (
         collection: number,
         config: PalletNftsCollectionConfig,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ForceCollectionConfig';
             params: { collection: number; config: PalletNftsCollectionConfig };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6749,21 +6553,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeDeadline
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         maybeDeadline: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveTransfer';
             params: { collection: number; item: number; delegate: MultiAddressLike; maybeDeadline: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6788,20 +6591,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelApproval';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6824,19 +6626,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearAllTransferApprovals: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearAllTransferApprovals';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6865,21 +6666,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} lockAttributes
      **/
     lockItemProperties: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         lockMetadata: boolean,
         lockAttributes: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'LockItemProperties';
             params: { collection: number; item: number; lockMetadata: boolean; lockAttributes: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6914,7 +6714,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     setAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
@@ -6922,7 +6721,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6935,7 +6733,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6966,7 +6765,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} value
      **/
     forceSetAttribute: GenericTxCall<
-      Rv,
       (
         setAs: AccountId32Like | undefined,
         collection: number,
@@ -6975,7 +6773,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         key: BytesLike,
         value: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -6989,7 +6786,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               value: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7016,14 +6814,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} key
      **/
     clearAttribute: GenericTxCall<
-      Rv,
       (
         collection: number,
         maybeItem: number | undefined,
         namespace: PalletNftsAttributeNamespace,
         key: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7035,7 +6831,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               key: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7055,20 +6852,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     approveItemAttributes: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ApproveItemAttributes';
             params: { collection: number; item: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7090,14 +6886,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsCancelAttributesApprovalWitness} witness
      **/
     cancelItemAttributesApproval: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         delegate: MultiAddressLike,
         witness: PalletNftsCancelAttributesApprovalWitness,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7109,7 +6903,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletNftsCancelAttributesApprovalWitness;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7136,20 +6931,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetMetadata';
             params: { collection: number; item: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7172,19 +6966,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} item
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearMetadata';
             params: { collection: number; item: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7209,19 +7002,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     setCollectionMetadata: GenericTxCall<
-      Rv,
       (
         collection: number,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMetadata';
             params: { collection: number; data: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7242,16 +7034,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} collection
      **/
     clearCollectionMetadata: GenericTxCall<
-      Rv,
       (collection: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'ClearCollectionMetadata';
             params: { collection: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7270,16 +7061,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeCollection
      **/
     setAcceptOwnership: GenericTxCall<
-      Rv,
       (maybeCollection: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetAcceptOwnership';
             params: { maybeCollection: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7298,19 +7088,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxSupply
      **/
     setCollectionMaxSupply: GenericTxCall<
-      Rv,
       (
         collection: number,
         maxSupply: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'SetCollectionMaxSupply';
             params: { collection: number; maxSupply: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7329,19 +7118,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsMintSettings} mintSettings
      **/
     updateMintSettings: GenericTxCall<
-      Rv,
       (
         collection: number,
         mintSettings: PalletNftsMintSettings,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'UpdateMintSettings';
             params: { collection: number; mintSettings: PalletNftsMintSettings };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7364,14 +7152,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} whitelistedBuyer
      **/
     setPrice: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         price: bigint | undefined,
         whitelistedBuyer: MultiAddressLike | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7383,7 +7169,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               whitelistedBuyer: MultiAddressLike | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7403,20 +7190,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bidPrice
      **/
     buyItem: GenericTxCall<
-      Rv,
       (
         collection: number,
         item: number,
         bidPrice: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'BuyItem';
             params: { collection: number; item: number; bidPrice: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7432,16 +7218,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletNftsItemTip>} tips
      **/
     payTips: GenericTxCall<
-      Rv,
       (tips: Array<PalletNftsItemTip>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'PayTips';
             params: { tips: Array<PalletNftsItemTip> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7471,7 +7256,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} duration
      **/
     createSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
@@ -7480,7 +7264,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maybePrice: PalletNftsPriceWithDirection | undefined,
         duration: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7494,7 +7277,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               duration: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7513,19 +7297,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} offeredItem
      **/
     cancelSwap: GenericTxCall<
-      Rv,
       (
         offeredCollection: number,
         offeredItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'CancelSwap';
             params: { offeredCollection: number; offeredItem: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7550,7 +7333,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNftsPriceWithDirection | undefined} witnessPrice
      **/
     claimSwap: GenericTxCall<
-      Rv,
       (
         sendCollection: number,
         sendItem: number,
@@ -7558,7 +7340,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         receiveItem: number,
         witnessPrice: PalletNftsPriceWithDirection | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7571,7 +7352,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessPrice: PalletNftsPriceWithDirection | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7595,20 +7377,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     mintPreSigned: GenericTxCall<
-      Rv,
       (
         mintData: PalletNftsPreSignedMint,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
             name: 'MintPreSigned';
             params: { mintData: PalletNftsPreSignedMint; signature: SpRuntimeMultiSignature; signer: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7632,13 +7413,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} signer
      **/
     setAttributesPreSigned: GenericTxCall<
-      Rv,
       (
         data: PalletNftsPreSignedAttributes,
         signature: SpRuntimeMultiSignature,
         signer: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Nfts';
           palletCall: {
@@ -7649,14 +7428,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signer: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ForeignAssets`'s transaction calls
@@ -7688,20 +7468,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Create';
             params: { id: StagingXcmV5Location; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7732,21 +7511,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7767,16 +7545,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7797,16 +7574,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7827,16 +7603,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7855,16 +7630,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7887,20 +7661,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Mint';
             params: { id: StagingXcmV5Location; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7926,20 +7699,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Burn';
             params: { id: StagingXcmV5Location; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7968,20 +7740,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8010,20 +7781,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: StagingXcmV5Location; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8054,21 +7824,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: StagingXcmV5Location; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8090,19 +7859,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8122,19 +7890,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8152,16 +7919,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8179,16 +7945,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8208,19 +7973,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8244,14 +8008,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8263,7 +8025,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               freezer: MultiAddressLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8291,21 +8054,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: StagingXcmV5Location; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8325,16 +8087,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8361,7 +8122,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         name: BytesLike,
@@ -8369,7 +8129,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8382,7 +8141,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8402,16 +8162,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8449,7 +8208,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
@@ -8460,7 +8218,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8476,7 +8233,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8507,20 +8265,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8543,19 +8300,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: StagingXcmV5Location; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8579,20 +8335,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: StagingXcmV5Location; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8622,14 +8377,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
@@ -8641,7 +8394,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8659,16 +8413,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: StagingXcmV5Location) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Touch';
             params: { id: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8691,19 +8444,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Refund';
             params: { id: StagingXcmV5Location; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8725,19 +8477,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: StagingXcmV5Location; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8758,19 +8509,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8793,19 +8543,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8825,19 +8574,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'Block';
             params: { id: StagingXcmV5Location; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8864,27 +8612,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: StagingXcmV5Location,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ForeignAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: StagingXcmV5Location; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NftFractionalization`'s transaction calls
@@ -8916,7 +8663,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fractions
      **/
     fractionalize: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
@@ -8924,7 +8670,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         beneficiary: MultiAddressLike,
         fractions: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
@@ -8937,7 +8682,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               fractions: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8965,28 +8711,27 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     unify: GenericTxCall<
-      Rv,
       (
         nftCollectionId: number,
         nftId: number,
         assetId: number,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NftFractionalization';
           palletCall: {
             name: 'Unify';
             params: { nftCollectionId: number; nftId: number; assetId: number; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PoolAssets`'s transaction calls
@@ -9018,20 +8763,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     create: GenericTxCall<
-      Rv,
       (
         id: number,
         admin: MultiAddressLike,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Create';
             params: { id: number; admin: MultiAddressLike; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9062,21 +8806,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     forceCreate: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         isSufficient: boolean,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCreate';
             params: { id: number; owner: MultiAddressLike; isSufficient: boolean; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9097,16 +8840,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     startDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'StartDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9127,16 +8869,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyAccounts: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyAccounts';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9157,16 +8898,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     destroyApprovals: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'DestroyApprovals';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9185,16 +8925,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     finishDestroy: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FinishDestroy';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9217,20 +8956,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     mint: GenericTxCall<
-      Rv,
       (
         id: number,
         beneficiary: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Mint';
             params: { id: number; beneficiary: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9256,20 +8994,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     burn: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Burn';
             params: { id: number; who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9298,20 +9035,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Transfer';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9340,20 +9076,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         id: number,
         target: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { id: number; target: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9384,21 +9119,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         source: MultiAddressLike,
         dest: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceTransfer';
             params: { id: number; source: MultiAddressLike; dest: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9420,19 +9154,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     freeze: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Freeze';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9452,19 +9185,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     thaw: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Thaw';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9482,16 +9214,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     freezeAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'FreezeAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9509,16 +9240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     thawAsset: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ThawAsset';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9538,19 +9268,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} owner
      **/
     transferOwnership: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferOwnership';
             params: { id: number; owner: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9574,21 +9303,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} freezer
      **/
     setTeam: GenericTxCall<
-      Rv,
       (
         id: number,
         issuer: MultiAddressLike,
         admin: MultiAddressLike,
         freezer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetTeam';
             params: { id: number; issuer: MultiAddressLike; admin: MultiAddressLike; freezer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9616,21 +9344,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} decimals
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
         symbol: BytesLike,
         decimals: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9650,16 +9377,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     clearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9686,7 +9412,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceSetMetadata: GenericTxCall<
-      Rv,
       (
         id: number,
         name: BytesLike,
@@ -9694,14 +9419,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         decimals: number,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceSetMetadata';
             params: { id: number; name: BytesLike; symbol: BytesLike; decimals: number; isFrozen: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9721,16 +9446,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     forceClearMetadata: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceClearMetadata';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9768,7 +9492,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} isFrozen
      **/
     forceAssetStatus: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
@@ -9779,7 +9502,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         isSufficient: boolean,
         isFrozen: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
@@ -9795,7 +9517,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               isFrozen: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9826,20 +9549,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     approveTransfer: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ApproveTransfer';
             params: { id: number; delegate: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9862,19 +9584,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     cancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'CancelApproval';
             params: { id: number; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9898,20 +9619,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} delegate
      **/
     forceCancelApproval: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         delegate: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'ForceCancelApproval';
             params: { id: number; owner: MultiAddressLike; delegate: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9941,21 +9661,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     transferApproved: GenericTxCall<
-      Rv,
       (
         id: number,
         owner: MultiAddressLike,
         destination: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferApproved';
             params: { id: number; owner: MultiAddressLike; destination: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9973,16 +9692,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} id
      **/
     touch: GenericTxCall<
-      Rv,
       (id: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Touch';
             params: { id: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10005,19 +9723,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} allowBurn
      **/
     refund: GenericTxCall<
-      Rv,
       (
         id: number,
         allowBurn: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Refund';
             params: { id: number; allowBurn: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10039,19 +9756,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} minBalance
      **/
     setMinBalance: GenericTxCall<
-      Rv,
       (
         id: number,
         minBalance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'SetMinBalance';
             params: { id: number; minBalance: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10072,19 +9788,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     touchOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TouchOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10107,19 +9822,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     refundOther: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'RefundOther';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10139,19 +9853,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} who
      **/
     block: GenericTxCall<
-      Rv,
       (
         id: number,
         who: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'Block';
             params: { id: number; who: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10178,27 +9891,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         id: number,
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PoolAssets';
           palletCall: {
             name: 'TransferAll';
             params: { id: number; dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversion`'s transaction calls
@@ -10214,19 +9926,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'CreatePool';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10255,7 +9966,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} mintTo
      **/
     addLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10265,7 +9975,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2Min: bigint,
         mintTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10280,7 +9989,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               mintTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10297,7 +10007,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} withdrawTo
      **/
     removeLiquidity: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -10306,7 +10015,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         amount2MinReceive: bigint,
         withdrawTo: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10320,7 +10028,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               withdrawTo: AccountId32Like;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10339,7 +10048,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapExactTokensForTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountIn: bigint,
@@ -10347,7 +10055,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10360,7 +10067,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10379,7 +10087,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     swapTokensForExactTokens: GenericTxCall<
-      Rv,
       (
         path: Array<StagingXcmV5Location>,
         amountOut: bigint,
@@ -10387,7 +10094,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         sendTo: AccountId32Like,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
@@ -10400,7 +10106,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keepAlive: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10421,26 +10128,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     touch: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversion';
           palletCall: {
             name: 'Touch';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Revive`'s transaction calls
@@ -10463,16 +10169,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} payload
      **/
     ethTransact: GenericTxCall<
-      Rv,
       (payload: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'EthTransact';
             params: { payload: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10501,7 +10206,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} data
      **/
     call: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: bigint,
@@ -10509,7 +10213,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         storageDepositLimit: bigint,
         data: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -10522,7 +10225,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               data: BytesLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10541,7 +10245,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiate: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -10550,7 +10253,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -10564,7 +10266,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10605,7 +10308,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32> | undefined} salt
      **/
     instantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: bigint,
         gasLimit: SpWeightsWeightV2Weight,
@@ -10614,7 +10316,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         data: BytesLike,
         salt: FixedBytes<32> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -10628,7 +10329,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               salt: FixedBytes<32> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10664,7 +10366,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} encodedLen
      **/
     ethInstantiateWithCode: GenericTxCall<
-      Rv,
       (
         value: U256,
         gasLimit: SpWeightsWeightV2Weight,
@@ -10674,7 +10375,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         effectiveGasPrice: U256,
         encodedLen: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -10689,7 +10389,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               encodedLen: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10706,7 +10407,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} encodedLen
      **/
     ethCall: GenericTxCall<
-      Rv,
       (
         dest: H160,
         value: U256,
@@ -10716,7 +10416,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         effectiveGasPrice: U256,
         encodedLen: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
@@ -10731,7 +10430,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               encodedLen: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10755,19 +10455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} storageDepositLimit
      **/
     uploadCode: GenericTxCall<
-      Rv,
       (
         code: BytesLike,
         storageDepositLimit: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UploadCode';
             params: { code: BytesLike; storageDepositLimit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10780,16 +10479,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     removeCode: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'RemoveCode';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10809,19 +10507,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     setCode: GenericTxCall<
-      Rv,
       (
         dest: H160,
         codeHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'SetCode';
             params: { dest: H160; codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10833,15 +10530,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     mapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'MapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10853,15 +10549,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     unmapAccount: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'UnmapAccount';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10875,23 +10570,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallbackAccount: GenericTxCall<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Revive';
           palletCall: {
             name: 'DispatchAsFallbackAccount';
             params: { call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRewards`'s transaction calls
@@ -10918,7 +10612,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} admin
      **/
     createPool: GenericTxCall<
-      Rv,
       (
         stakedAssetId: StagingXcmV5Location,
         rewardAssetId: StagingXcmV5Location,
@@ -10926,7 +10619,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         expiry: FrameSupportScheduleDispatchTime,
         admin: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
@@ -10939,7 +10631,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               admin: AccountId32Like | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10952,19 +10645,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     stake: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'Stake';
             params: { poolId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10984,20 +10676,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} staker
      **/
     unstake: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
         staker: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'Unstake';
             params: { poolId: number; amount: bigint; staker: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11013,19 +10704,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like | undefined} staker
      **/
     harvestRewards: GenericTxCall<
-      Rv,
       (
         poolId: number,
         staker: AccountId32Like | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'HarvestRewards';
             params: { poolId: number; staker: AccountId32Like | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11040,19 +10730,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newRewardRatePerBlock
      **/
     setPoolRewardRatePerBlock: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRewardRatePerBlock: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolRewardRatePerBlock';
             params: { poolId: number; newRewardRatePerBlock: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11065,19 +10754,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} newAdmin
      **/
     setPoolAdmin: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newAdmin: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolAdmin';
             params: { poolId: number; newAdmin: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11092,19 +10780,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} newExpiry
      **/
     setPoolExpiryBlock: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newExpiry: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'SetPoolExpiryBlock';
             params: { poolId: number; newExpiry: FrameSupportScheduleDispatchTime };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11119,19 +10806,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     depositRewardTokens: GenericTxCall<
-      Rv,
       (
         poolId: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'DepositRewardTokens';
             params: { poolId: number; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11146,23 +10832,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     cleanupPool: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRewards';
           palletCall: {
             name: 'CleanupPool';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StateTrieMigration`'s transaction calls
@@ -11176,16 +10861,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits | undefined} maybeConfig
      **/
     controlAutoMigration: GenericTxCall<
-      Rv,
       (maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ControlAutoMigration';
             params: { maybeConfig: PalletStateTrieMigrationMigrationLimits | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11217,13 +10901,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationTask} witnessTask
      **/
     continueMigrate: GenericTxCall<
-      Rv,
       (
         limits: PalletStateTrieMigrationMigrationLimits,
         realSizeUpper: number,
         witnessTask: PalletStateTrieMigrationMigrationTask,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
@@ -11234,7 +10916,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witnessTask: PalletStateTrieMigrationMigrationTask;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11248,19 +10931,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessSize
      **/
     migrateCustomTop: GenericTxCall<
-      Rv,
       (
         keys: Array<BytesLike>,
         witnessSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomTop';
             params: { keys: Array<BytesLike>; witnessSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11277,20 +10959,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} totalSize
      **/
     migrateCustomChild: GenericTxCall<
-      Rv,
       (
         root: BytesLike,
         childKeys: Array<BytesLike>,
         totalSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'MigrateCustomChild';
             params: { root: BytesLike; childKeys: Array<BytesLike>; totalSize: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11300,16 +10981,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationMigrationLimits} limits
      **/
     setSignedMaxLimits: GenericTxCall<
-      Rv,
       (limits: PalletStateTrieMigrationMigrationLimits) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'SetSignedMaxLimits';
             params: { limits: PalletStateTrieMigrationMigrationLimits };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11328,26 +11008,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStateTrieMigrationProgress} progressChild
      **/
     forceSetProgress: GenericTxCall<
-      Rv,
       (
         progressTop: PalletStateTrieMigrationProgress,
         progressChild: PalletStateTrieMigrationProgress,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StateTrieMigration';
           palletCall: {
             name: 'ForceSetProgress';
             params: { progressTop: PalletStateTrieMigrationProgress; progressChild: PalletStateTrieMigrationProgress };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -11371,19 +11050,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingAsyncRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11402,16 +11080,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11439,16 +11116,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11476,16 +11152,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11499,16 +11174,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingAsyncValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingAsyncValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11522,16 +11196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11549,15 +11222,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11571,16 +11243,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingAsyncRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingAsyncRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11596,15 +11267,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11616,16 +11286,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11638,16 +11307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11660,16 +11328,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11686,15 +11353,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11712,15 +11378,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11732,16 +11397,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11759,19 +11423,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11788,15 +11451,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11817,19 +11479,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Perbill]>} validatorSlashes
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         validatorSlashes: Array<[AccountId32Like, Perbill]>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; validatorSlashes: Array<[AccountId32Like, Perbill]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11852,19 +11513,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11876,16 +11536,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11913,19 +11572,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11945,16 +11603,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11986,7 +11643,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingAsyncPalletConfigOp,
         minValidatorBond: PalletStakingAsyncPalletConfigOp,
@@ -11996,7 +11652,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingAsyncPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -12011,7 +11666,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingAsyncPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12046,16 +11702,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12067,16 +11722,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12089,16 +11743,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12126,20 +11779,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12154,16 +11806,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12179,16 +11830,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12211,14 +11861,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingAsyncLedgerUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -12230,7 +11878,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingAsyncLedgerUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12246,16 +11895,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12298,19 +11946,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[AccountId32Like, Perbill, number]} slashKey
      **/
     applySlash: GenericTxCall<
-      Rv,
       (
         slashEra: number,
         slashKey: [AccountId32Like, Perbill, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ApplySlash';
             params: { slashEra: number; slashKey: [AccountId32Like, Perbill, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12330,23 +11977,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     pruneEraStep: GenericTxCall<
-      Rv,
       (era: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PruneEraStep';
             params: { era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -12374,19 +12020,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12402,16 +12047,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12427,15 +12071,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12476,19 +12119,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12504,19 +12146,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12548,19 +12189,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12589,21 +12229,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12622,7 +12261,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -12630,7 +12268,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12643,7 +12280,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12665,19 +12303,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12697,19 +12334,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12723,19 +12359,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12760,7 +12395,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -12769,7 +12403,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12783,7 +12416,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12802,14 +12436,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -12821,7 +12453,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12847,16 +12480,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12875,19 +12507,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12903,16 +12534,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12925,16 +12555,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12949,19 +12578,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -12976,19 +12604,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13002,19 +12629,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13039,16 +12665,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13064,16 +12689,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13087,19 +12711,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13117,16 +12740,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13144,16 +12766,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13171,23 +12792,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -13223,15 +12843,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13257,15 +12876,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13287,23 +12905,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -13324,16 +12941,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13352,16 +12968,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13374,26 +12989,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingRcClient`'s transaction calls
@@ -13405,16 +13019,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientSessionReport} report
      **/
     relaySessionReport: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientSessionReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelaySessionReport';
             params: { report: PalletStakingAsyncRcClientSessionReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13423,23 +13036,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[number, PalletStakingAsyncRcClientOffence]>} offences
      **/
     relayNewOffencePaged: GenericTxCall<
-      Rv,
       (offences: Array<[number, PalletStakingAsyncRcClientOffence]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingRcClient';
           palletCall: {
             name: 'RelayNewOffencePaged';
             params: { offences: Array<[number, PalletStakingAsyncRcClientOffence]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElection`'s transaction calls
@@ -13455,23 +13067,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockAdminOperation} op
      **/
     manage: GenericTxCall<
-      Rv,
       (op: PalletElectionProviderMultiBlockAdminOperation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElection';
           palletCall: {
             name: 'Manage';
             params: { op: PalletElectionProviderMultiBlockAdminOperation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s transaction calls
@@ -13480,7 +13091,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionUnsigned`'s transaction calls
@@ -13506,23 +13117,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiBlockPagedRawSolution} pagedSolution
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionUnsigned';
           palletCall: {
             name: 'SubmitUnsigned';
             params: { pagedSolution: PalletElectionProviderMultiBlockPagedRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s transaction calls
@@ -13534,16 +13144,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore} claimedScore
      **/
     register: GenericTxCall<
-      Rv,
       (claimedScore: SpNposElectionsElectionScore) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Register';
             params: { claimedScore: SpNposElectionsElectionScore };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13561,19 +13170,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeStakingNposCompactSolution16 | undefined} maybeSolution
      **/
     submitPage: GenericTxCall<
-      Rv,
       (
         page: number,
         maybeSolution: AssetHubWestendRuntimeStakingNposCompactSolution16 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SubmitPage';
             params: { page: number; maybeSolution: AssetHubWestendRuntimeStakingNposCompactSolution16 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13586,15 +13194,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     bail: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'Bail';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13610,19 +13217,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} witnessPages
      **/
     clearOldRoundData: GenericTxCall<
-      Rv,
       (
         round: number,
         witnessPages: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'ClearOldRoundData';
             params: { round: number; witnessPages: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13634,23 +13240,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} inv
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (inv: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockElectionSigned';
           palletCall: {
             name: 'SetInvulnerables';
             params: { inv: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -13671,19 +13276,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13718,14 +13322,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -13737,7 +13339,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13760,16 +13363,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13788,19 +13390,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13839,19 +13440,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13878,27 +13478,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -13920,13 +13519,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: AssetHubWestendRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -13937,7 +13534,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13954,16 +13552,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -13979,16 +13576,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14003,16 +13599,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14027,16 +13622,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14049,16 +13643,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14076,16 +13669,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14101,16 +13693,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14127,26 +13718,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -14157,16 +13747,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14175,16 +13764,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14195,20 +13783,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14217,23 +13804,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: AssetHubWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -14262,19 +13848,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14304,16 +13889,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14351,14 +13935,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: ParachainsCommonPayVersionedLocatableAccount,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -14370,7 +13952,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14400,16 +13983,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14439,16 +14021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14473,23 +14054,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -14505,19 +14085,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14531,19 +14110,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14556,23 +14134,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetConversionMigration`'s transaction calls
@@ -14588,26 +14165,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {StagingXcmV5Location} asset2
      **/
     migrateToNewAccount: GenericTxCall<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetConversionMigration';
           palletCall: {
             name: 'MigrateToNewAccount';
             params: { asset1: StagingXcmV5Location; asset2: StagingXcmV5Location };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AhOps`'s transaction calls
@@ -14628,20 +14204,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} paraId
      **/
     unreserveLeaseDeposit: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'UnreserveLeaseDeposit';
             params: { block: number; depositor: AccountId32Like | undefined; paraId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14659,20 +14234,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} paraId
      **/
     withdrawCrowdloanContribution: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'WithdrawCrowdloanContribution';
             params: { block: number; depositor: AccountId32Like | undefined; paraId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14691,20 +14265,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} paraId
      **/
     unreserveCrowdloanReserve: GenericTxCall<
-      Rv,
       (
         block: number,
         depositor: AccountId32Like | undefined,
         paraId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'UnreserveCrowdloanReserve';
             params: { block: number; depositor: AccountId32Like | undefined; paraId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14720,19 +14293,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} to
      **/
     migrateParachainSovereignAcc: GenericTxCall<
-      Rv,
       (
         from: AccountId32Like,
         to: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'MigrateParachainSovereignAcc';
             params: { from: AccountId32Like; to: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14749,20 +14321,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[AccountId32Like, number]} derivation
      **/
     migrateParachainSovereignDerivedAcc: GenericTxCall<
-      Rv,
       (
         from: AccountId32Like,
         to: AccountId32Like,
         derivation: [AccountId32Like, number],
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
             name: 'MigrateParachainSovereignDerivedAcc';
             params: { from: AccountId32Like; to: AccountId32Like; derivation: [AccountId32Like, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -14774,13 +14345,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AssetHubWestendRuntimeRuntimeHoldReason | undefined} reason
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         account: AccountId32Like,
         amount: bigint,
         reason: AssetHubWestendRuntimeRuntimeHoldReason | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AhOps';
           palletCall: {
@@ -14791,13 +14360,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               reason: AssetHubWestendRuntimeRuntimeHoldReason | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/westend-asset-hub/view-functions.d.ts b/packages/chaintypes/src/westend-asset-hub/view-functions.d.ts
index 8778c675..e9a226da 100644
--- a/packages/chaintypes/src/westend-asset-hub/view-functions.d.ts
+++ b/packages/chaintypes/src/westend-asset-hub/view-functions.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { Result, AccountId32Like } from 'dedot/codecs';
 import type {
   AssetHubWestendRuntimeRuntimeCallLike,
@@ -9,7 +9,7 @@ import type {
   PalletAssetConversionError,
 } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -21,7 +21,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubWestendRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: AssetHubWestendRuntimeRuntimeCallLike, proxyType: AssetHubWestendRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -32,14 +31,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AssetHubWestendRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: AssetHubWestendRuntimeProxyType, against: AssetHubWestendRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `AssetConversion`'s view functions
@@ -53,7 +51,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {StagingXcmV5Location} asset2
      **/
     getReserves: GenericViewFunction<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -75,7 +72,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {boolean} includeFee
      **/
     quotePriceExactTokensForTokens: GenericViewFunction<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -99,7 +95,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {boolean} includeFee
      **/
     quotePriceTokensForExactTokens: GenericViewFunction<
-      Rv,
       (
         asset1: StagingXcmV5Location,
         asset2: StagingXcmV5Location,
@@ -111,7 +106,7 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -128,12 +123,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s view functions
@@ -149,11 +144,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {AccountId32Like} who
      * @param {number} pages
      **/
-    depositFor: GenericViewFunction<Rv, (who: AccountId32Like, pages: number) => Promise<bigint>>;
+    depositFor: GenericViewFunction<(who: AccountId32Like, pages: number) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/consts.d.ts b/packages/chaintypes/src/westend-people/consts.d.ts
index 7ac7227b..776f76e2 100644
--- a/packages/chaintypes/src/westend-people/consts.d.ts
+++ b/packages/chaintypes/src/westend-people/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, AccountId32 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   SpWeightsWeightV2Weight,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/westend-people/errors.d.ts b/packages/chaintypes/src/westend-people/errors.d.ts
index 59fad339..7aae0ee1 100644
--- a/packages/chaintypes/src/westend-people/errors.d.ts
+++ b/packages/chaintypes/src/westend-people/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParachainSystem`'s errors
@@ -68,38 +68,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Attempt to upgrade validation function while existing upgrade pending.
      **/
-    OverlappingUpgrades: GenericPalletError<Rv>;
+    OverlappingUpgrades: GenericPalletError;
 
     /**
      * Polkadot currently prohibits this parachain from upgrading its validation function.
      **/
-    ProhibitedByPolkadot: GenericPalletError<Rv>;
+    ProhibitedByPolkadot: GenericPalletError;
 
     /**
      * The supplied validation function has compiled into a blob larger than Polkadot is
      * willing to run.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * The inherent which supplies the validation data did not run this block.
      **/
-    ValidationDataNotAvailable: GenericPalletError<Rv>;
+    ValidationDataNotAvailable: GenericPalletError;
 
     /**
      * The inherent which supplies the host configuration did not run this block.
      **/
-    HostConfigurationNotAvailable: GenericPalletError<Rv>;
+    HostConfigurationNotAvailable: GenericPalletError;
 
     /**
      * No validation function upgrade is currently scheduled.
      **/
-    NotScheduled: GenericPalletError<Rv>;
+    NotScheduled: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -108,67 +108,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CollatorSelection`'s errors
@@ -177,92 +177,92 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The pallet has too many candidates.
      **/
-    TooManyCandidates: GenericPalletError<Rv>;
+    TooManyCandidates: GenericPalletError;
 
     /**
      * Leaving would result in too few candidates.
      **/
-    TooFewEligibleCollators: GenericPalletError<Rv>;
+    TooFewEligibleCollators: GenericPalletError;
 
     /**
      * Account is already a candidate.
      **/
-    AlreadyCandidate: GenericPalletError<Rv>;
+    AlreadyCandidate: GenericPalletError;
 
     /**
      * Account is not a candidate.
      **/
-    NotCandidate: GenericPalletError<Rv>;
+    NotCandidate: GenericPalletError;
 
     /**
      * There are too many Invulnerables.
      **/
-    TooManyInvulnerables: GenericPalletError<Rv>;
+    TooManyInvulnerables: GenericPalletError;
 
     /**
      * Account is already an Invulnerable.
      **/
-    AlreadyInvulnerable: GenericPalletError<Rv>;
+    AlreadyInvulnerable: GenericPalletError;
 
     /**
      * Account is not an Invulnerable.
      **/
-    NotInvulnerable: GenericPalletError<Rv>;
+    NotInvulnerable: GenericPalletError;
 
     /**
      * Account has no associated validator ID.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Validator ID is not yet registered.
      **/
-    ValidatorNotRegistered: GenericPalletError<Rv>;
+    ValidatorNotRegistered: GenericPalletError;
 
     /**
      * Could not insert in the candidate list.
      **/
-    InsertToCandidateListFailed: GenericPalletError<Rv>;
+    InsertToCandidateListFailed: GenericPalletError;
 
     /**
      * Could not remove from the candidate list.
      **/
-    RemoveFromCandidateListFailed: GenericPalletError<Rv>;
+    RemoveFromCandidateListFailed: GenericPalletError;
 
     /**
      * New deposit amount would be below the minimum candidacy bond.
      **/
-    DepositTooLow: GenericPalletError<Rv>;
+    DepositTooLow: GenericPalletError;
 
     /**
      * Could not update the candidate list.
      **/
-    UpdateCandidateListFailed: GenericPalletError<Rv>;
+    UpdateCandidateListFailed: GenericPalletError;
 
     /**
      * Deposit amount is too low to take the target's slot in the candidate list.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * The target account to be replaced in the candidate list is not a candidate.
      **/
-    TargetIsNotCandidate: GenericPalletError<Rv>;
+    TargetIsNotCandidate: GenericPalletError;
 
     /**
      * The updated deposit amount is equal to the amount already reserved.
      **/
-    IdenticalDeposit: GenericPalletError<Rv>;
+    IdenticalDeposit: GenericPalletError;
 
     /**
      * Cannot lower candidacy bond while occupying a future collator slot in the list.
      **/
-    InvalidUnreserve: GenericPalletError<Rv>;
+    InvalidUnreserve: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -271,32 +271,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmpQueue`'s errors
@@ -305,32 +305,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Setting the queue config failed since one of its values was invalid.
      **/
-    BadQueueConfig: GenericPalletError<Rv>;
+    BadQueueConfig: GenericPalletError;
 
     /**
      * The execution is already suspended.
      **/
-    AlreadySuspended: GenericPalletError<Rv>;
+    AlreadySuspended: GenericPalletError;
 
     /**
      * The execution is already resumed.
      **/
-    AlreadyResumed: GenericPalletError<Rv>;
+    AlreadyResumed: GenericPalletError;
 
     /**
      * There are too many active outbound channels.
      **/
-    TooManyActiveOutboundChannels: GenericPalletError<Rv>;
+    TooManyActiveOutboundChannels: GenericPalletError;
 
     /**
      * The message is too big.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `PolkadotXcm`'s errors
@@ -340,152 +340,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -495,32 +495,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -528,24 +528,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -554,12 +554,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -568,78 +568,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -648,47 +648,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -697,158 +697,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -857,11 +857,11 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/events.d.ts b/packages/chaintypes/src/westend-people/events.d.ts
index 85010da7..1841e6f9 100644
--- a/packages/chaintypes/src/westend-people/events.d.ts
+++ b/packages/chaintypes/src/westend-people/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, FixedBytes, Result, Bytes } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -24,7 +24,7 @@ import type {
   PalletProxyDepositKind,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -32,18 +32,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -52,33 +46,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -87,7 +80,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParachainSystem`'s events
@@ -96,13 +89,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The validation function has been scheduled to apply.
      **/
-    ValidationFunctionStored: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionStored', null>;
+    ValidationFunctionStored: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionStored', null>;
 
     /**
      * The validation function was applied as of the contained relay chain block number.
      **/
     ValidationFunctionApplied: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'ValidationFunctionApplied',
       { relayChainBlockNum: number }
@@ -111,18 +103,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The relay-chain aborted the upgrade process.
      **/
-    ValidationFunctionDiscarded: GenericPalletEvent<Rv, 'ParachainSystem', 'ValidationFunctionDiscarded', null>;
+    ValidationFunctionDiscarded: GenericPalletEvent<'ParachainSystem', 'ValidationFunctionDiscarded', null>;
 
     /**
      * Some downward messages have been received and will be processed.
      **/
-    DownwardMessagesReceived: GenericPalletEvent<Rv, 'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
+    DownwardMessagesReceived: GenericPalletEvent<'ParachainSystem', 'DownwardMessagesReceived', { count: number }>;
 
     /**
      * Downward messages were processed using the given weight.
      **/
     DownwardMessagesProcessed: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'DownwardMessagesProcessed',
       { weightUsed: SpWeightsWeightV2Weight; dmqHead: H256 }
@@ -132,7 +123,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An upward message was sent to the relay chain.
      **/
     UpwardMessageSent: GenericPalletEvent<
-      Rv,
       'ParachainSystem',
       'UpwardMessageSent',
       { messageHash?: FixedBytes<32> | undefined }
@@ -141,7 +131,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -150,40 +140,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -192,93 +181,92 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some credit was balanced and added to the TotalIssuance.
      **/
-    MintedCredit: GenericPalletEvent<Rv, 'Balances', 'MintedCredit', { amount: bigint }>;
+    MintedCredit: GenericPalletEvent<'Balances', 'MintedCredit', { amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some debt has been dropped from the Total Issuance.
      **/
-    BurnedDebt: GenericPalletEvent<Rv, 'Balances', 'BurnedDebt', { amount: bigint }>;
+    BurnedDebt: GenericPalletEvent<'Balances', 'BurnedDebt', { amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Some balance was placed on hold.
      **/
     Held: GenericPalletEvent<
-      Rv,
       'Balances',
       'Held',
       { reason: PeopleWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -288,7 +276,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Held balance was burned from an account.
      **/
     BurnedHeld: GenericPalletEvent<
-      Rv,
       'Balances',
       'BurnedHeld',
       { reason: PeopleWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -298,7 +285,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A transfer of `amount` on hold from `source` to `dest` was initiated.
      **/
     TransferOnHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferOnHold',
       { reason: PeopleWestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; amount: bigint }
@@ -308,7 +294,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The `transferred` balance is placed on hold at the `dest` account.
      **/
     TransferAndHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferAndHold',
       { reason: PeopleWestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; transferred: bigint }
@@ -318,7 +303,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some balance was released from hold.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'Balances',
       'Released',
       { reason: PeopleWestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -327,12 +311,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -343,7 +327,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -352,7 +335,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CollatorSelection`'s events
@@ -362,7 +345,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New Invulnerables were set.
      **/
     NewInvulnerables: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewInvulnerables',
       { invulnerables: Array<AccountId32> }
@@ -371,18 +353,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new Invulnerable was added.
      **/
-    InvulnerableAdded: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
+    InvulnerableAdded: GenericPalletEvent<'CollatorSelection', 'InvulnerableAdded', { accountId: AccountId32 }>;
 
     /**
      * An Invulnerable was removed.
      **/
-    InvulnerableRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
+    InvulnerableRemoved: GenericPalletEvent<'CollatorSelection', 'InvulnerableRemoved', { accountId: AccountId32 }>;
 
     /**
      * The number of desired candidates was set.
      **/
     NewDesiredCandidates: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'NewDesiredCandidates',
       { desiredCandidates: number }
@@ -391,13 +372,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The candidacy bond was set.
      **/
-    NewCandidacyBond: GenericPalletEvent<Rv, 'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
+    NewCandidacyBond: GenericPalletEvent<'CollatorSelection', 'NewCandidacyBond', { bondAmount: bigint }>;
 
     /**
      * A new candidate joined.
      **/
     CandidateAdded: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateAdded',
       { accountId: AccountId32; deposit: bigint }
@@ -407,7 +387,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Bond of a candidate updated.
      **/
     CandidateBondUpdated: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateBondUpdated',
       { accountId: AccountId32; deposit: bigint }
@@ -416,13 +395,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A candidate was removed.
      **/
-    CandidateRemoved: GenericPalletEvent<Rv, 'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
+    CandidateRemoved: GenericPalletEvent<'CollatorSelection', 'CandidateRemoved', { accountId: AccountId32 }>;
 
     /**
      * An account was replaced in the candidate list by another one.
      **/
     CandidateReplaced: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'CandidateReplaced',
       { old: AccountId32; new: AccountId32; deposit: bigint }
@@ -433,7 +411,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * registered. Other Invulnerables may have been set.
      **/
     InvalidInvulnerableSkipped: GenericPalletEvent<
-      Rv,
       'CollatorSelection',
       'InvalidInvulnerableSkipped',
       { accountId: AccountId32 }
@@ -442,7 +419,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -452,28 +429,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmpQueue`'s events
@@ -482,12 +459,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An HRMP message was sent to a sibling parachain.
      **/
-    XcmpMessageSent: GenericPalletEvent<Rv, 'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
+    XcmpMessageSent: GenericPalletEvent<'XcmpQueue', 'XcmpMessageSent', { messageHash: FixedBytes<32> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `PolkadotXcm`'s events
@@ -496,13 +473,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'PolkadotXcm', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Sent',
       {
@@ -517,7 +493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SendFailed',
       {
@@ -532,7 +507,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -544,7 +518,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -555,7 +528,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -566,7 +538,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * been dispatched and executed successfully.
      **/
     Notified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'Notified',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -578,7 +549,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyOverweight',
       {
@@ -595,7 +565,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -607,7 +576,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -619,7 +587,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -635,7 +602,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -644,13 +610,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'PolkadotXcm', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -662,7 +627,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -673,7 +637,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -684,7 +647,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -695,7 +657,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -711,7 +672,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -723,7 +683,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'InvalidQuerier',
       {
@@ -739,7 +698,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -749,7 +707,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -760,7 +717,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -770,7 +726,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -780,7 +735,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -789,14 +743,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'PolkadotXcm', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -806,7 +759,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -816,7 +768,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'PolkadotXcm',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -825,7 +776,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `CumulusXcm`'s events
@@ -835,29 +786,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Downward message is invalid XCM.
      * \[ id \]
      **/
-    InvalidFormat: GenericPalletEvent<Rv, 'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
+    InvalidFormat: GenericPalletEvent<'CumulusXcm', 'InvalidFormat', FixedBytes<32>>;
 
     /**
      * Downward message is unsupported version of XCM.
      * \[ id \]
      **/
-    UnsupportedVersion: GenericPalletEvent<Rv, 'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
+    UnsupportedVersion: GenericPalletEvent<'CumulusXcm', 'UnsupportedVersion', FixedBytes<32>>;
 
     /**
      * Downward message executed with the given outcome.
      * \[ id, outcome \]
      **/
-    ExecutedDownward: GenericPalletEvent<
-      Rv,
-      'CumulusXcm',
-      'ExecutedDownward',
-      [FixedBytes<32>, StagingXcmV5TraitsOutcome]
-    >;
+    ExecutedDownward: GenericPalletEvent<'CumulusXcm', 'ExecutedDownward', [FixedBytes<32>, StagingXcmV5TraitsOutcome]>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -867,7 +813,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -895,7 +840,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -930,7 +874,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -960,7 +903,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -979,7 +921,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -989,47 +931,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1039,7 +981,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1049,7 +990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1059,7 +999,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1075,7 +1014,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1085,7 +1023,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1094,7 +1031,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1103,14 +1040,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1127,7 +1063,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       { pure: AccountId32; spawner: AccountId32; proxyType: PeopleWestendRuntimeProxyType; disambiguationIndex: number }
@@ -1136,13 +1071,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeopleWestendRuntimeProxyType; delay: number }
@@ -1152,7 +1086,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: PeopleWestendRuntimeProxyType; delay: number }
@@ -1162,7 +1095,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1171,7 +1103,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -1180,23 +1112,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -1206,7 +1137,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -1215,23 +1145,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1241,7 +1165,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -1250,18 +1173,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1272,7 +1189,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -1281,23 +1197,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -1306,19 +1221,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -1327,22 +1241,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -1354,7 +1268,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -1373,20 +1286,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -1401,7 +1313,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -1421,7 +1332,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -1443,7 +1353,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -1463,7 +1372,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -1477,7 +1385,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `IdentityMigrator`'s events
@@ -1486,14 +1394,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The identity and all sub accounts were reaped for `who`.
      **/
-    IdentityReaped: GenericPalletEvent<Rv, 'IdentityMigrator', 'IdentityReaped', { who: AccountId32 }>;
+    IdentityReaped: GenericPalletEvent<'IdentityMigrator', 'IdentityReaped', { who: AccountId32 }>;
 
     /**
      * The deposits held for `who` were updated. `identity` is the new deposit held for
      * identity info, and `subs` is the new deposit held for the sub-accounts.
      **/
     DepositUpdated: GenericPalletEvent<
-      Rv,
       'IdentityMigrator',
       'DepositUpdated',
       { who: AccountId32; identity: bigint; subs: bigint }
@@ -1502,6 +1409,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/index.d.ts b/packages/chaintypes/src/westend-people/index.d.ts
index d80a95f8..e1ea8092 100644
--- a/packages/chaintypes/src/westend-people/index.d.ts
+++ b/packages/chaintypes/src/westend-people/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   PeopleWestendRuntimeRuntimeCall,
@@ -42,26 +42,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     PalletTransactionPaymentChargeTransactionPayment,
     [],
   ];
-}
-
-export interface VersionedWestendPeopleApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: WestendPeopleApi
  * @specVersion: 1020001
  **/
-export interface WestendPeopleApi {
-  legacy: VersionedWestendPeopleApi<RpcLegacy>;
-  v2: VersionedWestendPeopleApi<RpcV2>;
+export interface WestendPeopleApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/westend-people/json-rpc.d.ts b/packages/chaintypes/src/westend-people/json-rpc.d.ts
index 64979c29..3be90856 100644
--- a/packages/chaintypes/src/westend-people/json-rpc.d.ts
+++ b/packages/chaintypes/src/westend-people/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -93,4 +93,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/westend-people/query.d.ts b/packages/chaintypes/src/westend-people/query.d.ts
index 1d0abdee..bdd70ad3 100644
--- a/packages/chaintypes/src/westend-people/query.d.ts
+++ b/packages/chaintypes/src/westend-people/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -67,7 +67,7 @@ import type {
   PalletMigrationsMigrationCursor,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -78,35 +78,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -114,7 +114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -122,28 +122,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -156,14 +156,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -180,21 +180,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -202,21 +202,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -229,12 +229,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -250,7 +250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -260,7 +260,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -274,7 +273,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -285,7 +284,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -294,14 +293,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -310,7 +309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -323,7 +322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -334,7 +333,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -346,7 +345,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -360,7 +359,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -374,7 +372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -384,7 +382,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -395,7 +393,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -406,7 +403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -416,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -425,7 +421,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -435,7 +431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -446,7 +441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -455,21 +450,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -477,7 +472,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -485,7 +480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -493,7 +488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -502,12 +497,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -518,7 +513,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -528,12 +523,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -543,12 +538,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -559,14 +554,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -597,7 +592,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -608,7 +603,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -618,7 +613,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -626,7 +621,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -634,12 +629,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -649,18 +644,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -671,12 +666,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -687,7 +682,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -698,7 +693,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -706,7 +701,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -715,7 +710,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -724,12 +719,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -740,14 +735,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -755,7 +750,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -763,7 +758,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, PeopleWestendRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, PeopleWestendRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, PeopleWestendRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -774,7 +769,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -782,11 +777,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PeopleWestendRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PeopleWestendRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => PeopleWestendRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -795,7 +786,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -803,7 +793,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -814,7 +804,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -823,12 +813,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -843,7 +833,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -853,12 +843,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -876,7 +866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -888,7 +878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -897,7 +887,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -909,7 +898,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -919,14 +907,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -935,7 +923,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -943,7 +930,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -954,7 +941,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -962,7 +949,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -973,7 +960,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -981,7 +968,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -990,7 +977,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1002,7 +988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1015,7 +1000,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1027,14 +1011,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1043,7 +1027,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1055,7 +1038,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1065,7 +1047,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -1078,7 +1060,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -1090,7 +1072,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1101,7 +1083,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1109,7 +1090,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1122,7 +1103,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1132,7 +1112,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1141,7 +1121,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1149,7 +1128,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1162,7 +1141,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1170,7 +1148,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1183,11 +1161,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1195,16 +1169,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1219,7 +1189,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -1227,7 +1197,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1236,7 +1206,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1248,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1258,7 +1228,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1266,7 +1236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1279,7 +1249,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1293,7 +1263,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1307,12 +1276,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -1325,7 +1294,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -1336,11 +1305,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/runtime.d.ts b/packages/chaintypes/src/westend-people/runtime.d.ts
index f36f1ed6..d2a65c81 100644
--- a/packages/chaintypes/src/westend-people/runtime.d.ts
+++ b/packages/chaintypes/src/westend-people/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   H256,
   RuntimeVersion,
@@ -53,7 +53,7 @@ import type {
   SpStatementStoreStatement,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: AuraApi - 0xdd718d5cc53262d4
    **/
@@ -65,19 +65,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuraApi_slot_duration
      **/
-    slotDuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlotDuration>>;
+    slotDuration: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlotDuration>>;
 
     /**
      * Return the current set of authorities.
      *
      * @callname: AuraApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpConsensusAuraSr25519AppSr25519Public>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RelayParentOffsetApi - 0x04e70521a0d3d2f8
@@ -88,12 +88,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: RelayParentOffsetApi_relay_parent_offset
      **/
-    relayParentOffset: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    relayParentOffset: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuraUnincludedSegmentApi - 0xd7bdd8a272ca0d65
@@ -115,12 +115,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} included_hash
      * @param {SpConsensusSlotsSlot} slot
      **/
-    canBuildUpon: GenericRuntimeApiMethod<Rv, (includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
+    canBuildUpon: GenericRuntimeApiMethod<(includedHash: H256, slot: SpConsensusSlotsSlot) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
@@ -131,7 +131,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -139,7 +139,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -147,12 +147,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -163,7 +163,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -174,7 +174,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -183,12 +183,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -204,7 +204,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -215,7 +214,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -224,7 +223,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -236,14 +234,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -266,7 +263,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -279,7 +275,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -291,12 +287,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -314,7 +310,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -325,14 +321,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -344,12 +339,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -362,7 +357,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -373,7 +367,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -382,19 +375,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -408,7 +401,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: PeopleWestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -420,7 +412,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: PeopleWestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -430,7 +421,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -438,12 +429,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -460,7 +451,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -475,7 +465,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -492,7 +481,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -511,7 +499,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -521,7 +508,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -536,7 +523,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: PeopleWestendRuntimeOriginCaller,
         call: PeopleWestendRuntimeRuntimeCallLike,
@@ -552,7 +538,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -562,7 +547,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -575,14 +560,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -600,7 +584,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -619,7 +602,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -629,7 +611,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorizedAliasersApi - 0x12c8e3d4d7e06de0
@@ -642,7 +624,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     authorizedAliasers: GenericRuntimeApiMethod<
-      Rv,
       (
         target: XcmVersionedLocation,
       ) => Promise<Result<Array<XcmRuntimeApisAuthorizedAliasesOriginAliaser>, XcmRuntimeApisAuthorizedAliasesError>>
@@ -656,7 +637,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} target
      **/
     isAuthorizedAlias: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: XcmVersionedLocation,
         target: XcmVersionedLocation,
@@ -666,7 +646,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: CollectCollationInfo - 0xea93e3f16f3d6962
@@ -681,12 +661,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: CollectCollationInfo_collect_collation_info
      * @param {Header} header
      **/
-    collectCollationInfo: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
+    collectCollationInfo: GenericRuntimeApiMethod<(header: Header) => Promise<CumulusPrimitivesCoreCollationInfo>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -707,7 +687,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -728,7 +708,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -738,12 +718,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GetParachainInfo - 0xa2ddb6a58477bf63
@@ -754,12 +734,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GetParachainInfo_parachain_id
      **/
-    parachainId: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachainId: GenericRuntimeApiMethod<() => Promise<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ValidateStatement - 0xbe9fb0c91a8046cf
@@ -773,7 +753,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpStatementStoreStatement} statement
      **/
     validateStatement: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpStatementStoreRuntimeApiStatementSource,
         statement: SpStatementStoreStatement,
@@ -783,6 +762,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/tx.d.ts b/packages/chaintypes/src/westend-people/tx.d.ts
index eff6b370..caa86602 100644
--- a/packages/chaintypes/src/westend-people/tx.d.ts
+++ b/packages/chaintypes/src/westend-people/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type { MultiAddressLike, Extrinsic, BytesLike, H256, AccountId32Like, FixedBytes, Data } from 'dedot/codecs';
 import type {
@@ -38,16 +36,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = PeopleWestendRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<PeopleWestendRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -60,16 +60,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -79,16 +78,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -98,16 +96,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -120,16 +117,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -139,16 +135,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -158,16 +153,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -181,19 +175,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -203,16 +196,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -225,16 +217,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -251,16 +242,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -278,23 +268,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainSystem`'s transaction calls
@@ -315,12 +304,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {CumulusPalletParachainSystemParachainInherentInboundMessagesData} inboundMessagesData
      **/
     setValidationData: GenericTxCall<
-      Rv,
       (
         data: CumulusPalletParachainSystemParachainInherentBasicParachainInherentData,
         inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
@@ -330,7 +317,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               inboundMessagesData: CumulusPalletParachainSystemParachainInherentInboundMessagesData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -339,23 +327,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} message
      **/
     sudoSendUpwardMessage: GenericTxCall<
-      Rv,
       (message: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParachainSystem';
           palletCall: {
             name: 'SudoSendUpwardMessage';
             params: { message: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -385,23 +372,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParachainInfo`'s transaction calls
@@ -410,7 +396,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -429,19 +415,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -454,20 +439,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -483,19 +467,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -520,19 +503,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -545,19 +527,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -574,16 +555,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -596,19 +576,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -623,19 +602,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -652,26 +630,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CollatorSelection`'s transaction calls
@@ -695,16 +672,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} new_
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (new_: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetInvulnerables';
             params: { new: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -718,16 +694,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} max
      **/
     setDesiredCandidates: GenericTxCall<
-      Rv,
       (max: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetDesiredCandidates';
             params: { max: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -743,16 +718,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} bond
      **/
     setCandidacyBond: GenericTxCall<
-      Rv,
       (bond: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'SetCandidacyBond';
             params: { bond: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -764,15 +738,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerAsCandidate: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RegisterAsCandidate';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -785,15 +758,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     leaveIntent: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'LeaveIntent';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -806,16 +778,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     addInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'AddInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -828,16 +799,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     removeInvulnerable: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'RemoveInvulnerable';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -853,16 +823,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newDeposit
      **/
     updateBond: GenericTxCall<
-      Rv,
       (newDeposit: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'UpdateBond';
             params: { newDeposit: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -879,26 +848,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} target
      **/
     takeCandidateSlot: GenericTxCall<
-      Rv,
       (
         deposit: bigint,
         target: AccountId32Like,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'CollatorSelection';
           palletCall: {
             name: 'TakeCandidateSlot';
             params: { deposit: bigint; target: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -919,19 +887,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: PeopleWestendRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: PeopleWestendRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -951,22 +918,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmpQueue`'s transaction calls
@@ -979,15 +945,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     suspendXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'SuspendXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1000,15 +965,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     resumeXcmExecution: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'ResumeXcmExecution';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1022,16 +986,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateSuspendThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateSuspendThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1045,16 +1008,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateDropThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateDropThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1068,23 +1030,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     updateResumeThreshold: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmpQueue';
           palletCall: {
             name: 'UpdateResumeThreshold';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `PolkadotXcm`'s transaction calls
@@ -1096,19 +1057,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1140,14 +1100,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1159,7 +1117,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1203,14 +1162,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1222,7 +1179,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1240,19 +1198,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1268,19 +1225,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1294,16 +1250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1316,16 +1271,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1340,16 +1294,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1392,7 +1345,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1400,7 +1352,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1413,7 +1364,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1444,7 +1396,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1452,7 +1403,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1465,7 +1415,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1478,16 +1429,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1533,7 +1483,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -1541,7 +1490,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1554,7 +1502,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1570,19 +1519,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1645,7 +1593,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -1655,7 +1602,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
@@ -1670,7 +1616,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1691,19 +1638,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1714,16 +1660,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1733,22 +1678,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'PolkadotXcm';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `CumulusXcm`'s transaction calls
@@ -1757,7 +1701,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -1770,19 +1714,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1807,14 +1750,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: CumulusPrimitivesCoreAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -1826,14 +1767,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -1862,16 +1804,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleWestendRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<PeopleWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<PeopleWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1894,19 +1835,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: PeopleWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1928,16 +1868,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleWestendRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<PeopleWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<PeopleWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1953,19 +1892,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: PeopleWestendRuntimeOriginCaller,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: PeopleWestendRuntimeOriginCaller; call: PeopleWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1987,16 +1925,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PeopleWestendRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<PeopleWestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<PeopleWestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2012,19 +1949,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: PeopleWestendRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: PeopleWestendRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2057,19 +1993,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: PeopleWestendRuntimeRuntimeCallLike,
         fallback: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: PeopleWestendRuntimeRuntimeCallLike; fallback: PeopleWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2084,26 +2019,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: PeopleWestendRuntimeOriginCaller,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: PeopleWestendRuntimeOriginCaller; call: PeopleWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -2127,19 +2061,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: PeopleWestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2191,7 +2124,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2199,7 +2131,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: PeopleWestendRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2212,7 +2143,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2255,7 +2187,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -2263,7 +2194,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2276,7 +2206,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2309,14 +2240,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -2328,7 +2257,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2352,27 +2282,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -2394,13 +2323,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: PeopleWestendRuntimeProxyType | undefined,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2411,7 +2338,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeopleWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2431,20 +2359,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeopleWestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: PeopleWestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2462,20 +2389,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: PeopleWestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: PeopleWestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2489,15 +2415,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2526,20 +2451,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: PeopleWestendRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: PeopleWestendRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2568,7 +2492,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: PeopleWestendRuntimeProxyType,
@@ -2576,7 +2499,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2589,7 +2511,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2614,19 +2537,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2646,19 +2568,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2678,19 +2599,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2713,14 +2633,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: PeopleWestendRuntimeProxyType | undefined,
         call: PeopleWestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -2732,7 +2650,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: PeopleWestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2748,22 +2667,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2781,16 +2699,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2809,16 +2726,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PeopleWestendRuntimePeopleIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PeopleWestendRuntimePeopleIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PeopleWestendRuntimePeopleIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2836,16 +2752,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2861,15 +2776,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2895,19 +2809,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2926,16 +2839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2952,19 +2864,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2981,19 +2892,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3010,19 +2920,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3049,21 +2958,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3084,16 +2992,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3110,19 +3017,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3136,19 +3042,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3164,16 +3069,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3191,15 +3095,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3215,20 +3118,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3239,19 +3141,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3276,14 +3177,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -3295,7 +3194,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3306,16 +3206,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3327,16 +3226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3346,16 +3244,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3367,16 +3264,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3387,16 +3283,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3407,23 +3302,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -3439,16 +3333,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3465,20 +3358,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3490,15 +3382,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3512,23 +3403,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `IdentityMigrator`'s transaction calls
@@ -3541,16 +3431,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     reapIdentity: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IdentityMigrator';
           palletCall: {
             name: 'ReapIdentity';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3561,22 +3450,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IdentityMigrator';
           palletCall: {
             name: 'PokeDeposit';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/westend-people/view-functions.d.ts b/packages/chaintypes/src/westend-people/view-functions.d.ts
index 084131a0..c82f036c 100644
--- a/packages/chaintypes/src/westend-people/view-functions.d.ts
+++ b/packages/chaintypes/src/westend-people/view-functions.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { PeopleWestendRuntimeRuntimeCallLike, PeopleWestendRuntimeProxyType } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -15,7 +15,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeopleWestendRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: PeopleWestendRuntimeRuntimeCallLike, proxyType: PeopleWestendRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -26,13 +25,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {PeopleWestendRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: PeopleWestendRuntimeProxyType, against: PeopleWestendRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/packages/chaintypes/src/westend/consts.d.ts b/packages/chaintypes/src/westend/consts.d.ts
index a2e56824..fcad9dcb 100644
--- a/packages/chaintypes/src/westend/consts.d.ts
+++ b/packages/chaintypes/src/westend/consts.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainConsts, RpcVersion } from 'dedot/types';
+import type { GenericChainConsts } from 'dedot/types';
 import type { RuntimeVersion, Perbill, Permill, AccountId32, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemLimitsBlockWeights,
@@ -12,7 +12,7 @@ import type {
   StagingXcmV5Junctions,
 } from './types.js';
 
-export interface ChainConsts<Rv extends RpcVersion> extends GenericChainConsts<Rv> {
+export interface ChainConsts extends GenericChainConsts {
   /**
    * Pallet `System`'s constants
    **/
diff --git a/packages/chaintypes/src/westend/errors.d.ts b/packages/chaintypes/src/westend/errors.d.ts
index d0e2b4db..291fc74f 100644
--- a/packages/chaintypes/src/westend/errors.d.ts
+++ b/packages/chaintypes/src/westend/errors.d.ts
@@ -1,8 +1,8 @@
 // Generated by dedot cli
 
-import type { GenericChainErrors, GenericPalletError, RpcVersion } from 'dedot/types';
+import type { GenericChainErrors, GenericPalletError } from 'dedot/types';
 
-export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<Rv> {
+export interface ChainErrors extends GenericChainErrors {
   /**
    * Pallet `System`'s errors
    **/
@@ -11,55 +11,55 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The name of specification does not match between the current runtime
      * and the new runtime.
      **/
-    InvalidSpecName: GenericPalletError<Rv>;
+    InvalidSpecName: GenericPalletError;
 
     /**
      * The specification version is not allowed to decrease between the current runtime
      * and the new runtime.
      **/
-    SpecVersionNeedsToIncrease: GenericPalletError<Rv>;
+    SpecVersionNeedsToIncrease: GenericPalletError;
 
     /**
      * Failed to extract the runtime version from the new runtime.
      *
      * Either calling `Core_version` or decoding `RuntimeVersion` failed.
      **/
-    FailedToExtractRuntimeVersion: GenericPalletError<Rv>;
+    FailedToExtractRuntimeVersion: GenericPalletError;
 
     /**
      * Suicide called when the account has non-default composite data.
      **/
-    NonDefaultComposite: GenericPalletError<Rv>;
+    NonDefaultComposite: GenericPalletError;
 
     /**
      * There is a non-zero reference count preventing the account from being purged.
      **/
-    NonZeroRefCount: GenericPalletError<Rv>;
+    NonZeroRefCount: GenericPalletError;
 
     /**
      * The origin filter prevent the call to be dispatched.
      **/
-    CallFiltered: GenericPalletError<Rv>;
+    CallFiltered: GenericPalletError;
 
     /**
      * A multi-block migration is ongoing and prevents the current code from being replaced.
      **/
-    MultiBlockMigrationsOngoing: GenericPalletError<Rv>;
+    MultiBlockMigrationsOngoing: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Babe`'s errors
@@ -68,27 +68,27 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Indices`'s errors
@@ -97,32 +97,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The index was not already assigned.
      **/
-    NotAssigned: GenericPalletError<Rv>;
+    NotAssigned: GenericPalletError;
 
     /**
      * The index is assigned to another account.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * The index was not available.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * The source and destination accounts are identical.
      **/
-    NotTransfer: GenericPalletError<Rv>;
+    NotTransfer: GenericPalletError;
 
     /**
      * The index is permanent and may not be freed/changed.
      **/
-    Permanent: GenericPalletError<Rv>;
+    Permanent: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Balances`'s errors
@@ -131,67 +131,67 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Vesting balance too high to send value.
      **/
-    VestingBalance: GenericPalletError<Rv>;
+    VestingBalance: GenericPalletError;
 
     /**
      * Account liquidity restrictions prevent withdrawal.
      **/
-    LiquidityRestrictions: GenericPalletError<Rv>;
+    LiquidityRestrictions: GenericPalletError;
 
     /**
      * Balance too low to send value.
      **/
-    InsufficientBalance: GenericPalletError<Rv>;
+    InsufficientBalance: GenericPalletError;
 
     /**
      * Value too low to create account due to existential deposit.
      **/
-    ExistentialDeposit: GenericPalletError<Rv>;
+    ExistentialDeposit: GenericPalletError;
 
     /**
      * Transfer/payment would kill account.
      **/
-    Expendability: GenericPalletError<Rv>;
+    Expendability: GenericPalletError;
 
     /**
      * A vesting schedule already exists for this account.
      **/
-    ExistingVestingSchedule: GenericPalletError<Rv>;
+    ExistingVestingSchedule: GenericPalletError;
 
     /**
      * Beneficiary account must pre-exist.
      **/
-    DeadAccount: GenericPalletError<Rv>;
+    DeadAccount: GenericPalletError;
 
     /**
      * Number of named reserves exceed `MaxReserves`.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Number of holds exceed `VariantCountOf<T::RuntimeHoldReason>`.
      **/
-    TooManyHolds: GenericPalletError<Rv>;
+    TooManyHolds: GenericPalletError;
 
     /**
      * Number of freezes exceed `MaxFreezes`.
      **/
-    TooManyFreezes: GenericPalletError<Rv>;
+    TooManyFreezes: GenericPalletError;
 
     /**
      * The issuance cannot be modified since it is already deactivated.
      **/
-    IssuanceDeactivated: GenericPalletError<Rv>;
+    IssuanceDeactivated: GenericPalletError;
 
     /**
      * The delta cannot be zero.
      **/
-    DeltaZero: GenericPalletError<Rv>;
+    DeltaZero: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Staking`'s errors
@@ -200,182 +200,182 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Not a controller account.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * Not a stash account.
      **/
-    NotStash: GenericPalletError<Rv>;
+    NotStash: GenericPalletError;
 
     /**
      * Stash is already bonded.
      **/
-    AlreadyBonded: GenericPalletError<Rv>;
+    AlreadyBonded: GenericPalletError;
 
     /**
      * Controller is already paired.
      **/
-    AlreadyPaired: GenericPalletError<Rv>;
+    AlreadyPaired: GenericPalletError;
 
     /**
      * Targets cannot be empty.
      **/
-    EmptyTargets: GenericPalletError<Rv>;
+    EmptyTargets: GenericPalletError;
 
     /**
      * Duplicate index.
      **/
-    DuplicateIndex: GenericPalletError<Rv>;
+    DuplicateIndex: GenericPalletError;
 
     /**
      * Slash record index out of bounds.
      **/
-    InvalidSlashIndex: GenericPalletError<Rv>;
+    InvalidSlashIndex: GenericPalletError;
 
     /**
      * Cannot have a validator or nominator role, with value less than the minimum defined by
      * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
      * intention, `chill` first to remove one's role as validator/nominator.
      **/
-    InsufficientBond: GenericPalletError<Rv>;
+    InsufficientBond: GenericPalletError;
 
     /**
      * Can not schedule more unlock chunks.
      **/
-    NoMoreChunks: GenericPalletError<Rv>;
+    NoMoreChunks: GenericPalletError;
 
     /**
      * Can not rebond without unlocking chunks.
      **/
-    NoUnlockChunk: GenericPalletError<Rv>;
+    NoUnlockChunk: GenericPalletError;
 
     /**
      * Attempting to target a stash that still has funds.
      **/
-    FundedTarget: GenericPalletError<Rv>;
+    FundedTarget: GenericPalletError;
 
     /**
      * Invalid era to reward.
      **/
-    InvalidEraToReward: GenericPalletError<Rv>;
+    InvalidEraToReward: GenericPalletError;
 
     /**
      * Invalid number of nominations.
      **/
-    InvalidNumberOfNominations: GenericPalletError<Rv>;
+    InvalidNumberOfNominations: GenericPalletError;
 
     /**
      * Items are not sorted and unique.
      **/
-    NotSortedAndUnique: GenericPalletError<Rv>;
+    NotSortedAndUnique: GenericPalletError;
 
     /**
      * Rewards for this era have already been claimed for this validator.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * No nominators exist on this page.
      **/
-    InvalidPage: GenericPalletError<Rv>;
+    InvalidPage: GenericPalletError;
 
     /**
      * Incorrect previous history depth input provided.
      **/
-    IncorrectHistoryDepth: GenericPalletError<Rv>;
+    IncorrectHistoryDepth: GenericPalletError;
 
     /**
      * Incorrect number of slashing spans provided.
      **/
-    IncorrectSlashingSpans: GenericPalletError<Rv>;
+    IncorrectSlashingSpans: GenericPalletError;
 
     /**
      * Internal state has become somehow corrupted and the operation cannot continue.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Too many nomination targets supplied.
      **/
-    TooManyTargets: GenericPalletError<Rv>;
+    TooManyTargets: GenericPalletError;
 
     /**
      * A nomination target was supplied that was blocked or otherwise not a validator.
      **/
-    BadTarget: GenericPalletError<Rv>;
+    BadTarget: GenericPalletError;
 
     /**
      * The user has enough bond and thus cannot be chilled forcefully by an external person.
      **/
-    CannotChillOther: GenericPalletError<Rv>;
+    CannotChillOther: GenericPalletError;
 
     /**
      * There are too many nominators in the system. Governance needs to adjust the staking
      * settings to keep things safe for the runtime.
      **/
-    TooManyNominators: GenericPalletError<Rv>;
+    TooManyNominators: GenericPalletError;
 
     /**
      * There are too many validator candidates in the system. Governance needs to adjust the
      * staking settings to keep things safe for the runtime.
      **/
-    TooManyValidators: GenericPalletError<Rv>;
+    TooManyValidators: GenericPalletError;
 
     /**
      * Commission is too low. Must be at least `MinCommission`.
      **/
-    CommissionTooLow: GenericPalletError<Rv>;
+    CommissionTooLow: GenericPalletError;
 
     /**
      * Some bound is not met.
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Used when attempting to use deprecated controller account logic.
      **/
-    ControllerDeprecated: GenericPalletError<Rv>;
+    ControllerDeprecated: GenericPalletError;
 
     /**
      * Cannot reset a ledger.
      **/
-    CannotRestoreLedger: GenericPalletError<Rv>;
+    CannotRestoreLedger: GenericPalletError;
 
     /**
      * Provided reward destination is not allowed.
      **/
-    RewardDestinationRestricted: GenericPalletError<Rv>;
+    RewardDestinationRestricted: GenericPalletError;
 
     /**
      * Not enough funds available to withdraw.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Operation not allowed for virtual stakers.
      **/
-    VirtualStakerNotAllowed: GenericPalletError<Rv>;
+    VirtualStakerNotAllowed: GenericPalletError;
 
     /**
      * Stash could not be reaped as other pallet might depend on it.
      **/
-    CannotReapStash: GenericPalletError<Rv>;
+    CannotReapStash: GenericPalletError;
 
     /**
      * The stake of this account is already migrated to `Fungible` holds.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * Account is restricted from participation in staking. This may happen if the account is
      * staking in another way already, such as via pool.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Session`'s errors
@@ -384,32 +384,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid ownership proof.
      **/
-    InvalidProof: GenericPalletError<Rv>;
+    InvalidProof: GenericPalletError;
 
     /**
      * No associated validator ID for account.
      **/
-    NoAssociatedValidatorId: GenericPalletError<Rv>;
+    NoAssociatedValidatorId: GenericPalletError;
 
     /**
      * Registered duplicate key.
      **/
-    DuplicatedKey: GenericPalletError<Rv>;
+    DuplicatedKey: GenericPalletError;
 
     /**
      * No keys are associated with this account.
      **/
-    NoKeys: GenericPalletError<Rv>;
+    NoKeys: GenericPalletError;
 
     /**
      * Key setting account is not live, so it's impossible to associate keys.
      **/
-    NoAccount: GenericPalletError<Rv>;
+    NoAccount: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Grandpa`'s errors
@@ -419,43 +419,43 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Attempt to signal GRANDPA pause when the authority set isn't live
      * (either paused or already pending pause).
      **/
-    PauseFailed: GenericPalletError<Rv>;
+    PauseFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA resume when the authority set isn't paused
      * (either live or already pending resume).
      **/
-    ResumeFailed: GenericPalletError<Rv>;
+    ResumeFailed: GenericPalletError;
 
     /**
      * Attempt to signal GRANDPA change with one already pending.
      **/
-    ChangePending: GenericPalletError<Rv>;
+    ChangePending: GenericPalletError;
 
     /**
      * Cannot signal forced change so soon after last.
      **/
-    TooSoon: GenericPalletError<Rv>;
+    TooSoon: GenericPalletError;
 
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * An equivocation proof provided as part of an equivocation report is invalid.
      **/
-    InvalidEquivocationProof: GenericPalletError<Rv>;
+    InvalidEquivocationProof: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Utility`'s errors
@@ -464,12 +464,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many calls batched.
      **/
-    TooManyCalls: GenericPalletError<Rv>;
+    TooManyCalls: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Identity`'s errors
@@ -478,158 +478,158 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Too many subs-accounts.
      **/
-    TooManySubAccounts: GenericPalletError<Rv>;
+    TooManySubAccounts: GenericPalletError;
 
     /**
      * Account isn't found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Account isn't named.
      **/
-    NotNamed: GenericPalletError<Rv>;
+    NotNamed: GenericPalletError;
 
     /**
      * Empty index.
      **/
-    EmptyIndex: GenericPalletError<Rv>;
+    EmptyIndex: GenericPalletError;
 
     /**
      * Fee is changed.
      **/
-    FeeChanged: GenericPalletError<Rv>;
+    FeeChanged: GenericPalletError;
 
     /**
      * No identity found.
      **/
-    NoIdentity: GenericPalletError<Rv>;
+    NoIdentity: GenericPalletError;
 
     /**
      * Sticky judgement.
      **/
-    StickyJudgement: GenericPalletError<Rv>;
+    StickyJudgement: GenericPalletError;
 
     /**
      * Judgement given.
      **/
-    JudgementGiven: GenericPalletError<Rv>;
+    JudgementGiven: GenericPalletError;
 
     /**
      * Invalid judgement.
      **/
-    InvalidJudgement: GenericPalletError<Rv>;
+    InvalidJudgement: GenericPalletError;
 
     /**
      * The index is invalid.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * The target is invalid.
      **/
-    InvalidTarget: GenericPalletError<Rv>;
+    InvalidTarget: GenericPalletError;
 
     /**
      * Maximum amount of registrars reached. Cannot add any more.
      **/
-    TooManyRegistrars: GenericPalletError<Rv>;
+    TooManyRegistrars: GenericPalletError;
 
     /**
      * Account ID is already named.
      **/
-    AlreadyClaimed: GenericPalletError<Rv>;
+    AlreadyClaimed: GenericPalletError;
 
     /**
      * Sender is not a sub-account.
      **/
-    NotSub: GenericPalletError<Rv>;
+    NotSub: GenericPalletError;
 
     /**
      * Sub-account isn't owned by sender.
      **/
-    NotOwned: GenericPalletError<Rv>;
+    NotOwned: GenericPalletError;
 
     /**
      * The provided judgement was for a different identity.
      **/
-    JudgementForDifferentIdentity: GenericPalletError<Rv>;
+    JudgementForDifferentIdentity: GenericPalletError;
 
     /**
      * Error that occurs when there is an issue paying for judgement.
      **/
-    JudgementPaymentFailed: GenericPalletError<Rv>;
+    JudgementPaymentFailed: GenericPalletError;
 
     /**
      * The provided suffix is too long.
      **/
-    InvalidSuffix: GenericPalletError<Rv>;
+    InvalidSuffix: GenericPalletError;
 
     /**
      * The sender does not have permission to issue a username.
      **/
-    NotUsernameAuthority: GenericPalletError<Rv>;
+    NotUsernameAuthority: GenericPalletError;
 
     /**
      * The authority cannot allocate any more usernames.
      **/
-    NoAllocation: GenericPalletError<Rv>;
+    NoAllocation: GenericPalletError;
 
     /**
      * The signature on a username was not valid.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Setting this username requires a signature, but none was provided.
      **/
-    RequiresSignature: GenericPalletError<Rv>;
+    RequiresSignature: GenericPalletError;
 
     /**
      * The username does not meet the requirements.
      **/
-    InvalidUsername: GenericPalletError<Rv>;
+    InvalidUsername: GenericPalletError;
 
     /**
      * The username is already taken.
      **/
-    UsernameTaken: GenericPalletError<Rv>;
+    UsernameTaken: GenericPalletError;
 
     /**
      * The requested username does not exist.
      **/
-    NoUsername: GenericPalletError<Rv>;
+    NoUsername: GenericPalletError;
 
     /**
      * The username cannot be forcefully removed because it can still be accepted.
      **/
-    NotExpired: GenericPalletError<Rv>;
+    NotExpired: GenericPalletError;
 
     /**
      * The username cannot be removed because it's still in the grace period.
      **/
-    TooEarly: GenericPalletError<Rv>;
+    TooEarly: GenericPalletError;
 
     /**
      * The username cannot be removed because it is not unbinding.
      **/
-    NotUnbinding: GenericPalletError<Rv>;
+    NotUnbinding: GenericPalletError;
 
     /**
      * The username cannot be unbound because it is already unbinding.
      **/
-    AlreadyUnbinding: GenericPalletError<Rv>;
+    AlreadyUnbinding: GenericPalletError;
 
     /**
      * The action cannot be performed because of insufficient privileges (e.g. authority
      * trying to unbind a username provided by the system).
      **/
-    InsufficientPrivileges: GenericPalletError<Rv>;
+    InsufficientPrivileges: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Recovery`'s errors
@@ -638,87 +638,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * User is not allowed to make a call on behalf of this account
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * Threshold must be greater than zero
      **/
-    ZeroThreshold: GenericPalletError<Rv>;
+    ZeroThreshold: GenericPalletError;
 
     /**
      * Friends list must be greater than zero and threshold
      **/
-    NotEnoughFriends: GenericPalletError<Rv>;
+    NotEnoughFriends: GenericPalletError;
 
     /**
      * Friends list must be less than max friends
      **/
-    MaxFriends: GenericPalletError<Rv>;
+    MaxFriends: GenericPalletError;
 
     /**
      * Friends list must be sorted and free of duplicates
      **/
-    NotSorted: GenericPalletError<Rv>;
+    NotSorted: GenericPalletError;
 
     /**
      * This account is not set up for recovery
      **/
-    NotRecoverable: GenericPalletError<Rv>;
+    NotRecoverable: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyRecoverable: GenericPalletError<Rv>;
+    AlreadyRecoverable: GenericPalletError;
 
     /**
      * A recovery process has already started for this account
      **/
-    AlreadyStarted: GenericPalletError<Rv>;
+    AlreadyStarted: GenericPalletError;
 
     /**
      * A recovery process has not started for this rescuer
      **/
-    NotStarted: GenericPalletError<Rv>;
+    NotStarted: GenericPalletError;
 
     /**
      * This account is not a friend who can vouch
      **/
-    NotFriend: GenericPalletError<Rv>;
+    NotFriend: GenericPalletError;
 
     /**
      * The friend must wait until the delay period to vouch for this recovery
      **/
-    DelayPeriod: GenericPalletError<Rv>;
+    DelayPeriod: GenericPalletError;
 
     /**
      * This user has already vouched for this recovery
      **/
-    AlreadyVouched: GenericPalletError<Rv>;
+    AlreadyVouched: GenericPalletError;
 
     /**
      * The threshold for recovering this account has not been met
      **/
-    Threshold: GenericPalletError<Rv>;
+    Threshold: GenericPalletError;
 
     /**
      * There are still active recovery attempts that need to be closed
      **/
-    StillActive: GenericPalletError<Rv>;
+    StillActive: GenericPalletError;
 
     /**
      * This account is already set up for recovery
      **/
-    AlreadyProxy: GenericPalletError<Rv>;
+    AlreadyProxy: GenericPalletError;
 
     /**
      * Some internal state is broken.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Vesting`'s errors
@@ -727,33 +727,33 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account given is not vesting.
      **/
-    NotVesting: GenericPalletError<Rv>;
+    NotVesting: GenericPalletError;
 
     /**
      * The account already has `MaxVestingSchedules` count of schedules and thus
      * cannot add another one. Consider merging existing schedules in order to add another.
      **/
-    AtMaxVestingSchedules: GenericPalletError<Rv>;
+    AtMaxVestingSchedules: GenericPalletError;
 
     /**
      * Amount being transferred is too low to create a vesting schedule.
      **/
-    AmountLow: GenericPalletError<Rv>;
+    AmountLow: GenericPalletError;
 
     /**
      * An index was out of bounds of the vesting schedules.
      **/
-    ScheduleIndexOutOfBounds: GenericPalletError<Rv>;
+    ScheduleIndexOutOfBounds: GenericPalletError;
 
     /**
      * Failed to create a new schedule because some parameter was invalid.
      **/
-    InvalidScheduleParams: GenericPalletError<Rv>;
+    InvalidScheduleParams: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Scheduler`'s errors
@@ -762,32 +762,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to schedule a call
      **/
-    FailedToSchedule: GenericPalletError<Rv>;
+    FailedToSchedule: GenericPalletError;
 
     /**
      * Cannot find the scheduled call.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Given target block number is in the past.
      **/
-    TargetBlockNumberInPast: GenericPalletError<Rv>;
+    TargetBlockNumberInPast: GenericPalletError;
 
     /**
      * Reschedule failed because it does not change scheduled time.
      **/
-    RescheduleNoChange: GenericPalletError<Rv>;
+    RescheduleNoChange: GenericPalletError;
 
     /**
      * Attempt to use a non-named function on a named task.
      **/
-    Named: GenericPalletError<Rv>;
+    Named: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Preimage`'s errors
@@ -796,47 +796,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Preimage is too large to store on-chain.
      **/
-    TooBig: GenericPalletError<Rv>;
+    TooBig: GenericPalletError;
 
     /**
      * Preimage has already been noted on-chain.
      **/
-    AlreadyNoted: GenericPalletError<Rv>;
+    AlreadyNoted: GenericPalletError;
 
     /**
      * The user is not authorized to perform this action.
      **/
-    NotAuthorized: GenericPalletError<Rv>;
+    NotAuthorized: GenericPalletError;
 
     /**
      * The preimage cannot be removed since it has not yet been noted.
      **/
-    NotNoted: GenericPalletError<Rv>;
+    NotNoted: GenericPalletError;
 
     /**
      * A preimage may not be removed when there are outstanding requests.
      **/
-    Requested: GenericPalletError<Rv>;
+    Requested: GenericPalletError;
 
     /**
      * The preimage request cannot be removed since no outstanding requests exist.
      **/
-    NotRequested: GenericPalletError<Rv>;
+    NotRequested: GenericPalletError;
 
     /**
      * More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Too few hashes were requested to be upgraded (i.e. zero).
      **/
-    TooFew: GenericPalletError<Rv>;
+    TooFew: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Sudo`'s errors
@@ -845,12 +845,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Sender must be the Sudo account.
      **/
-    RequireSudo: GenericPalletError<Rv>;
+    RequireSudo: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Proxy`'s errors
@@ -859,47 +859,47 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * There are too many proxies registered or too many announcements pending.
      **/
-    TooMany: GenericPalletError<Rv>;
+    TooMany: GenericPalletError;
 
     /**
      * Proxy registration not found.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Sender is not a proxy of the account to be proxied.
      **/
-    NotProxy: GenericPalletError<Rv>;
+    NotProxy: GenericPalletError;
 
     /**
      * A call which is incompatible with the proxy type's filter was attempted.
      **/
-    Unproxyable: GenericPalletError<Rv>;
+    Unproxyable: GenericPalletError;
 
     /**
      * Account is already a proxy.
      **/
-    Duplicate: GenericPalletError<Rv>;
+    Duplicate: GenericPalletError;
 
     /**
      * Call may not be made by proxy because it may escalate its privileges.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * Announcement, if made at all, was made too recently.
      **/
-    Unannounced: GenericPalletError<Rv>;
+    Unannounced: GenericPalletError;
 
     /**
      * Cannot add self as proxy.
      **/
-    NoSelfProxy: GenericPalletError<Rv>;
+    NoSelfProxy: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Multisig`'s errors
@@ -908,78 +908,78 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Threshold must be 2 or greater.
      **/
-    MinimumThreshold: GenericPalletError<Rv>;
+    MinimumThreshold: GenericPalletError;
 
     /**
      * Call is already approved by this signatory.
      **/
-    AlreadyApproved: GenericPalletError<Rv>;
+    AlreadyApproved: GenericPalletError;
 
     /**
      * Call doesn't need any (more) approvals.
      **/
-    NoApprovalsNeeded: GenericPalletError<Rv>;
+    NoApprovalsNeeded: GenericPalletError;
 
     /**
      * There are too few signatories in the list.
      **/
-    TooFewSignatories: GenericPalletError<Rv>;
+    TooFewSignatories: GenericPalletError;
 
     /**
      * There are too many signatories in the list.
      **/
-    TooManySignatories: GenericPalletError<Rv>;
+    TooManySignatories: GenericPalletError;
 
     /**
      * The signatories were provided out of order; they should be ordered.
      **/
-    SignatoriesOutOfOrder: GenericPalletError<Rv>;
+    SignatoriesOutOfOrder: GenericPalletError;
 
     /**
      * The sender was contained in the other signatories; it shouldn't be.
      **/
-    SenderInSignatories: GenericPalletError<Rv>;
+    SenderInSignatories: GenericPalletError;
 
     /**
      * Multisig operation not found in storage.
      **/
-    NotFound: GenericPalletError<Rv>;
+    NotFound: GenericPalletError;
 
     /**
      * Only the account that originally created the multisig is able to cancel it or update
      * its deposits.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * No timepoint was given, yet the multisig operation is already underway.
      **/
-    NoTimepoint: GenericPalletError<Rv>;
+    NoTimepoint: GenericPalletError;
 
     /**
      * A different timepoint was given to the multisig operation that is underway.
      **/
-    WrongTimepoint: GenericPalletError<Rv>;
+    WrongTimepoint: GenericPalletError;
 
     /**
      * A timepoint was given, yet no multisig operation is underway.
      **/
-    UnexpectedTimepoint: GenericPalletError<Rv>;
+    UnexpectedTimepoint: GenericPalletError;
 
     /**
      * The maximum weight information provided was too low.
      **/
-    MaxWeightTooLow: GenericPalletError<Rv>;
+    MaxWeightTooLow: GenericPalletError;
 
     /**
      * The data to be stored is already stored.
      **/
-    AlreadyStored: GenericPalletError<Rv>;
+    AlreadyStored: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s errors
@@ -988,82 +988,82 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Submission was too early.
      **/
-    PreDispatchEarlySubmission: GenericPalletError<Rv>;
+    PreDispatchEarlySubmission: GenericPalletError;
 
     /**
      * Wrong number of winners presented.
      **/
-    PreDispatchWrongWinnerCount: GenericPalletError<Rv>;
+    PreDispatchWrongWinnerCount: GenericPalletError;
 
     /**
      * Submission was too weak, score-wise.
      **/
-    PreDispatchWeakSubmission: GenericPalletError<Rv>;
+    PreDispatchWeakSubmission: GenericPalletError;
 
     /**
      * The queue was full, and the solution was not better than any of the existing ones.
      **/
-    SignedQueueFull: GenericPalletError<Rv>;
+    SignedQueueFull: GenericPalletError;
 
     /**
      * The origin failed to pay the deposit.
      **/
-    SignedCannotPayDeposit: GenericPalletError<Rv>;
+    SignedCannotPayDeposit: GenericPalletError;
 
     /**
      * Witness data to dispatchable is invalid.
      **/
-    SignedInvalidWitness: GenericPalletError<Rv>;
+    SignedInvalidWitness: GenericPalletError;
 
     /**
      * The signed submission consumes too much weight
      **/
-    SignedTooMuchWeight: GenericPalletError<Rv>;
+    SignedTooMuchWeight: GenericPalletError;
 
     /**
      * OCW submitted solution for wrong round
      **/
-    OcwCallWrongEra: GenericPalletError<Rv>;
+    OcwCallWrongEra: GenericPalletError;
 
     /**
      * Snapshot metadata should exist but didn't.
      **/
-    MissingSnapshotMetadata: GenericPalletError<Rv>;
+    MissingSnapshotMetadata: GenericPalletError;
 
     /**
      * `Self::insert_submission` returned an invalid index.
      **/
-    InvalidSubmissionIndex: GenericPalletError<Rv>;
+    InvalidSubmissionIndex: GenericPalletError;
 
     /**
      * The call is not allowed at this point.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * The fallback failed
      **/
-    FallbackFailed: GenericPalletError<Rv>;
+    FallbackFailed: GenericPalletError;
 
     /**
      * Some bound not met
      **/
-    BoundNotMet: GenericPalletError<Rv>;
+    BoundNotMet: GenericPalletError;
 
     /**
      * Submitted solution has too many winners
      **/
-    TooManyWinners: GenericPalletError<Rv>;
+    TooManyWinners: GenericPalletError;
 
     /**
      * Submission was prepared for a different round.
      **/
-    PreDispatchDifferentRound: GenericPalletError<Rv>;
+    PreDispatchDifferentRound: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `VoterList`'s errors
@@ -1072,17 +1072,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A error in the list interface implementation.
      **/
-    List: GenericPalletError<Rv>;
+    List: GenericPalletError;
 
     /**
      * Could not update a node, because the pallet is locked.
      **/
-    Locked: GenericPalletError<Rv>;
+    Locked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `NominationPools`'s errors
@@ -1091,44 +1091,44 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A (bonded) pool id does not exist.
      **/
-    PoolNotFound: GenericPalletError<Rv>;
+    PoolNotFound: GenericPalletError;
 
     /**
      * An account is not a member.
      **/
-    PoolMemberNotFound: GenericPalletError<Rv>;
+    PoolMemberNotFound: GenericPalletError;
 
     /**
      * A reward pool does not exist. In all cases this is a system logic error.
      **/
-    RewardPoolNotFound: GenericPalletError<Rv>;
+    RewardPoolNotFound: GenericPalletError;
 
     /**
      * A sub pool does not exist.
      **/
-    SubPoolsNotFound: GenericPalletError<Rv>;
+    SubPoolsNotFound: GenericPalletError;
 
     /**
      * An account is already delegating in another pool. An account may only belong to one
      * pool at a time.
      **/
-    AccountBelongsToOtherPool: GenericPalletError<Rv>;
+    AccountBelongsToOtherPool: GenericPalletError;
 
     /**
      * The member is fully unbonded (and thus cannot access the bonded and reward pool
      * anymore to, for example, collect rewards).
      **/
-    FullyUnbonding: GenericPalletError<Rv>;
+    FullyUnbonding: GenericPalletError;
 
     /**
      * The member cannot unbond further chunks due to reaching the limit.
      **/
-    MaxUnbondingLimit: GenericPalletError<Rv>;
+    MaxUnbondingLimit: GenericPalletError;
 
     /**
      * None of the funds can be withdrawn yet because the bonding duration has not passed.
      **/
-    CannotWithdrawAny: GenericPalletError<Rv>;
+    CannotWithdrawAny: GenericPalletError;
 
     /**
      * The amount does not meet the minimum bond to either join or create a pool.
@@ -1137,160 +1137,160 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * caller does not have nominating permissions for the pool. Members can never unbond to a
      * value below `MinJoinBond`.
      **/
-    MinimumBondNotMet: GenericPalletError<Rv>;
+    MinimumBondNotMet: GenericPalletError;
 
     /**
      * The transaction could not be executed due to overflow risk for the pool.
      **/
-    OverflowRisk: GenericPalletError<Rv>;
+    OverflowRisk: GenericPalletError;
 
     /**
      * A pool must be in [`PoolState::Destroying`] in order for the depositor to unbond or for
      * other members to be permissionlessly unbonded.
      **/
-    NotDestroying: GenericPalletError<Rv>;
+    NotDestroying: GenericPalletError;
 
     /**
      * The caller does not have nominating permissions for the pool.
      **/
-    NotNominator: GenericPalletError<Rv>;
+    NotNominator: GenericPalletError;
 
     /**
      * Either a) the caller cannot make a valid kick or b) the pool is not destroying.
      **/
-    NotKickerOrDestroying: GenericPalletError<Rv>;
+    NotKickerOrDestroying: GenericPalletError;
 
     /**
      * The pool is not open to join
      **/
-    NotOpen: GenericPalletError<Rv>;
+    NotOpen: GenericPalletError;
 
     /**
      * The system is maxed out on pools.
      **/
-    MaxPools: GenericPalletError<Rv>;
+    MaxPools: GenericPalletError;
 
     /**
      * Too many members in the pool or system.
      **/
-    MaxPoolMembers: GenericPalletError<Rv>;
+    MaxPoolMembers: GenericPalletError;
 
     /**
      * The pools state cannot be changed.
      **/
-    CanNotChangeState: GenericPalletError<Rv>;
+    CanNotChangeState: GenericPalletError;
 
     /**
      * The caller does not have adequate permissions.
      **/
-    DoesNotHavePermission: GenericPalletError<Rv>;
+    DoesNotHavePermission: GenericPalletError;
 
     /**
      * Metadata exceeds [`Config::MaxMetadataLen`]
      **/
-    MetadataExceedsMaxLen: GenericPalletError<Rv>;
+    MetadataExceedsMaxLen: GenericPalletError;
 
     /**
      * Some error occurred that should never happen. This should be reported to the
      * maintainers.
      **/
-    Defensive: GenericPalletError<Rv>;
+    Defensive: GenericPalletError;
 
     /**
      * Partial unbonding now allowed permissionlessly.
      **/
-    PartialUnbondNotAllowedPermissionlessly: GenericPalletError<Rv>;
+    PartialUnbondNotAllowedPermissionlessly: GenericPalletError;
 
     /**
      * The pool's max commission cannot be set higher than the existing value.
      **/
-    MaxCommissionRestricted: GenericPalletError<Rv>;
+    MaxCommissionRestricted: GenericPalletError;
 
     /**
      * The supplied commission exceeds the max allowed commission.
      **/
-    CommissionExceedsMaximum: GenericPalletError<Rv>;
+    CommissionExceedsMaximum: GenericPalletError;
 
     /**
      * The supplied commission exceeds global maximum commission.
      **/
-    CommissionExceedsGlobalMaximum: GenericPalletError<Rv>;
+    CommissionExceedsGlobalMaximum: GenericPalletError;
 
     /**
      * Not enough blocks have surpassed since the last commission update.
      **/
-    CommissionChangeThrottled: GenericPalletError<Rv>;
+    CommissionChangeThrottled: GenericPalletError;
 
     /**
      * The submitted changes to commission change rate are not allowed.
      **/
-    CommissionChangeRateNotAllowed: GenericPalletError<Rv>;
+    CommissionChangeRateNotAllowed: GenericPalletError;
 
     /**
      * There is no pending commission to claim.
      **/
-    NoPendingCommission: GenericPalletError<Rv>;
+    NoPendingCommission: GenericPalletError;
 
     /**
      * No commission current has been set.
      **/
-    NoCommissionCurrentSet: GenericPalletError<Rv>;
+    NoCommissionCurrentSet: GenericPalletError;
 
     /**
      * Pool id currently in use.
      **/
-    PoolIdInUse: GenericPalletError<Rv>;
+    PoolIdInUse: GenericPalletError;
 
     /**
      * Pool id provided is not correct/usable.
      **/
-    InvalidPoolId: GenericPalletError<Rv>;
+    InvalidPoolId: GenericPalletError;
 
     /**
      * Bonding extra is restricted to the exact pending reward amount.
      **/
-    BondExtraRestricted: GenericPalletError<Rv>;
+    BondExtraRestricted: GenericPalletError;
 
     /**
      * No imbalance in the ED deposit for the pool.
      **/
-    NothingToAdjust: GenericPalletError<Rv>;
+    NothingToAdjust: GenericPalletError;
 
     /**
      * No slash pending that can be applied to the member.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * The slash amount is too low to be applied.
      **/
-    SlashTooLow: GenericPalletError<Rv>;
+    SlashTooLow: GenericPalletError;
 
     /**
      * The pool or member delegation has already migrated to delegate stake.
      **/
-    AlreadyMigrated: GenericPalletError<Rv>;
+    AlreadyMigrated: GenericPalletError;
 
     /**
      * The pool or member delegation has not migrated yet to delegate stake.
      **/
-    NotMigrated: GenericPalletError<Rv>;
+    NotMigrated: GenericPalletError;
 
     /**
      * This call is not allowed in the current state of the pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Account is restricted from participation in pools. This may happen if the account is
      * staking in another way already.
      **/
-    Restricted: GenericPalletError<Rv>;
+    Restricted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `FastUnstake`'s errors
@@ -1301,37 +1301,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      *
      * This means that the given account is not bonded.
      **/
-    NotController: GenericPalletError<Rv>;
+    NotController: GenericPalletError;
 
     /**
      * The bonded account has already been queued.
      **/
-    AlreadyQueued: GenericPalletError<Rv>;
+    AlreadyQueued: GenericPalletError;
 
     /**
      * The bonded account has active unlocking chunks.
      **/
-    NotFullyBonded: GenericPalletError<Rv>;
+    NotFullyBonded: GenericPalletError;
 
     /**
      * The provided un-staker is not in the `Queue`.
      **/
-    NotQueued: GenericPalletError<Rv>;
+    NotQueued: GenericPalletError;
 
     /**
      * The provided un-staker is already in Head, and cannot deregister.
      **/
-    AlreadyHead: GenericPalletError<Rv>;
+    AlreadyHead: GenericPalletError;
 
     /**
      * The call is not allowed at this point because the pallet is not active.
      **/
-    CallNotAllowed: GenericPalletError<Rv>;
+    CallNotAllowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ConvictionVoting`'s errors
@@ -1340,68 +1340,68 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Poll is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * The given account did not vote on the poll.
      **/
-    NotVoter: GenericPalletError<Rv>;
+    NotVoter: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The actor has no permission to conduct the action right now but will do in the future.
      **/
-    NoPermissionYet: GenericPalletError<Rv>;
+    NoPermissionYet: GenericPalletError;
 
     /**
      * The account is already delegating.
      **/
-    AlreadyDelegating: GenericPalletError<Rv>;
+    AlreadyDelegating: GenericPalletError;
 
     /**
      * The account currently has votes attached to it and the operation cannot succeed until
      * these are removed through `remove_vote`.
      **/
-    AlreadyVoting: GenericPalletError<Rv>;
+    AlreadyVoting: GenericPalletError;
 
     /**
      * Too high a balance was provided that the account cannot afford.
      **/
-    InsufficientFunds: GenericPalletError<Rv>;
+    InsufficientFunds: GenericPalletError;
 
     /**
      * The account is not currently delegating.
      **/
-    NotDelegating: GenericPalletError<Rv>;
+    NotDelegating: GenericPalletError;
 
     /**
      * Delegation to oneself makes no sense.
      **/
-    Nonsense: GenericPalletError<Rv>;
+    Nonsense: GenericPalletError;
 
     /**
      * Maximum number of votes reached.
      **/
-    MaxVotesReached: GenericPalletError<Rv>;
+    MaxVotesReached: GenericPalletError;
 
     /**
      * The class must be supplied since it is not easily determinable from the state.
      **/
-    ClassNeeded: GenericPalletError<Rv>;
+    ClassNeeded: GenericPalletError;
 
     /**
      * The class ID supplied is invalid.
      **/
-    BadClass: GenericPalletError<Rv>;
+    BadClass: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Referenda`'s errors
@@ -1410,77 +1410,77 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Referendum is not ongoing.
      **/
-    NotOngoing: GenericPalletError<Rv>;
+    NotOngoing: GenericPalletError;
 
     /**
      * Referendum's decision deposit is already paid.
      **/
-    HasDeposit: GenericPalletError<Rv>;
+    HasDeposit: GenericPalletError;
 
     /**
      * The track identifier given was invalid.
      **/
-    BadTrack: GenericPalletError<Rv>;
+    BadTrack: GenericPalletError;
 
     /**
      * There are already a full complement of referenda in progress for this track.
      **/
-    Full: GenericPalletError<Rv>;
+    Full: GenericPalletError;
 
     /**
      * The queue of the track is empty.
      **/
-    QueueEmpty: GenericPalletError<Rv>;
+    QueueEmpty: GenericPalletError;
 
     /**
      * The referendum index provided is invalid in this context.
      **/
-    BadReferendum: GenericPalletError<Rv>;
+    BadReferendum: GenericPalletError;
 
     /**
      * There was nothing to do in the advancement.
      **/
-    NothingToDo: GenericPalletError<Rv>;
+    NothingToDo: GenericPalletError;
 
     /**
      * No track exists for the proposal origin.
      **/
-    NoTrack: GenericPalletError<Rv>;
+    NoTrack: GenericPalletError;
 
     /**
      * Any deposit cannot be refunded until after the decision is over.
      **/
-    Unfinished: GenericPalletError<Rv>;
+    Unfinished: GenericPalletError;
 
     /**
      * The deposit refunder is not the depositor.
      **/
-    NoPermission: GenericPalletError<Rv>;
+    NoPermission: GenericPalletError;
 
     /**
      * The deposit cannot be refunded since none was made.
      **/
-    NoDeposit: GenericPalletError<Rv>;
+    NoDeposit: GenericPalletError;
 
     /**
      * The referendum status is invalid for this operation.
      **/
-    BadStatus: GenericPalletError<Rv>;
+    BadStatus: GenericPalletError;
 
     /**
      * The preimage does not exist.
      **/
-    PreimageNotExist: GenericPalletError<Rv>;
+    PreimageNotExist: GenericPalletError;
 
     /**
      * The preimage is stored with a different length than the one provided.
      **/
-    PreimageStoredWithDifferentLength: GenericPalletError<Rv>;
+    PreimageStoredWithDifferentLength: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Whitelist`'s errors
@@ -1489,32 +1489,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The preimage of the call hash could not be loaded.
      **/
-    UnavailablePreImage: GenericPalletError<Rv>;
+    UnavailablePreImage: GenericPalletError;
 
     /**
      * The call could not be decoded.
      **/
-    UndecodableCall: GenericPalletError<Rv>;
+    UndecodableCall: GenericPalletError;
 
     /**
      * The weight of the decoded call was higher than the witness.
      **/
-    InvalidCallWeightWitness: GenericPalletError<Rv>;
+    InvalidCallWeightWitness: GenericPalletError;
 
     /**
      * The call was not whitelisted.
      **/
-    CallIsNotWhitelisted: GenericPalletError<Rv>;
+    CallIsNotWhitelisted: GenericPalletError;
 
     /**
      * The call was already whitelisted; No-Op.
      **/
-    CallAlreadyWhitelisted: GenericPalletError<Rv>;
+    CallAlreadyWhitelisted: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Treasury`'s errors
@@ -1523,63 +1523,63 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * No proposal, bounty or spend at that index.
      **/
-    InvalidIndex: GenericPalletError<Rv>;
+    InvalidIndex: GenericPalletError;
 
     /**
      * Too many approvals in the queue.
      **/
-    TooManyApprovals: GenericPalletError<Rv>;
+    TooManyApprovals: GenericPalletError;
 
     /**
      * The spend origin is valid but the amount it is allowed to spend is lower than the
      * amount to be spent.
      **/
-    InsufficientPermission: GenericPalletError<Rv>;
+    InsufficientPermission: GenericPalletError;
 
     /**
      * Proposal has not been approved.
      **/
-    ProposalNotApproved: GenericPalletError<Rv>;
+    ProposalNotApproved: GenericPalletError;
 
     /**
      * The balance of the asset kind is not convertible to the balance of the native asset.
      **/
-    FailedToConvertBalance: GenericPalletError<Rv>;
+    FailedToConvertBalance: GenericPalletError;
 
     /**
      * The spend has expired and cannot be claimed.
      **/
-    SpendExpired: GenericPalletError<Rv>;
+    SpendExpired: GenericPalletError;
 
     /**
      * The spend is not yet eligible for payout.
      **/
-    EarlyPayout: GenericPalletError<Rv>;
+    EarlyPayout: GenericPalletError;
 
     /**
      * The payment has already been attempted.
      **/
-    AlreadyAttempted: GenericPalletError<Rv>;
+    AlreadyAttempted: GenericPalletError;
 
     /**
      * There was some issue with the mechanism of payment.
      **/
-    PayoutError: GenericPalletError<Rv>;
+    PayoutError: GenericPalletError;
 
     /**
      * The payout was not yet attempted/claimed.
      **/
-    NotAttempted: GenericPalletError<Rv>;
+    NotAttempted: GenericPalletError;
 
     /**
      * The payment has neither failed nor succeeded yet.
      **/
-    Inconclusive: GenericPalletError<Rv>;
+    Inconclusive: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `DelegatedStaking`'s errors
@@ -1588,17 +1588,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The account cannot perform this operation.
      **/
-    NotAllowed: GenericPalletError<Rv>;
+    NotAllowed: GenericPalletError;
 
     /**
      * An existing staker cannot perform this action.
      **/
-    AlreadyStaking: GenericPalletError<Rv>;
+    AlreadyStaking: GenericPalletError;
 
     /**
      * Reward Destination cannot be same as `Agent` account.
      **/
-    InvalidRewardDestination: GenericPalletError<Rv>;
+    InvalidRewardDestination: GenericPalletError;
 
     /**
      * Delegation conditions are not met.
@@ -1607,52 +1607,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * 1) Cannot delegate to self,
      * 2) Cannot delegate to multiple delegates.
      **/
-    InvalidDelegation: GenericPalletError<Rv>;
+    InvalidDelegation: GenericPalletError;
 
     /**
      * The account does not have enough funds to perform the operation.
      **/
-    NotEnoughFunds: GenericPalletError<Rv>;
+    NotEnoughFunds: GenericPalletError;
 
     /**
      * Not an existing `Agent` account.
      **/
-    NotAgent: GenericPalletError<Rv>;
+    NotAgent: GenericPalletError;
 
     /**
      * Not a Delegator account.
      **/
-    NotDelegator: GenericPalletError<Rv>;
+    NotDelegator: GenericPalletError;
 
     /**
      * Some corruption in internal state.
      **/
-    BadState: GenericPalletError<Rv>;
+    BadState: GenericPalletError;
 
     /**
      * Unapplied pending slash restricts operation on `Agent`.
      **/
-    UnappliedSlash: GenericPalletError<Rv>;
+    UnappliedSlash: GenericPalletError;
 
     /**
      * `Agent` has no pending slash to be applied.
      **/
-    NothingToSlash: GenericPalletError<Rv>;
+    NothingToSlash: GenericPalletError;
 
     /**
      * Failed to withdraw amount from Core Staking.
      **/
-    WithdrawFailed: GenericPalletError<Rv>;
+    WithdrawFailed: GenericPalletError;
 
     /**
      * Operation not supported by this pallet.
      **/
-    NotSupported: GenericPalletError<Rv>;
+    NotSupported: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Configuration`'s errors
@@ -1661,12 +1661,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The new value for a configuration parameter is invalid.
      **/
-    InvalidNewValue: GenericPalletError<Rv>;
+    InvalidNewValue: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInclusion`'s errors
@@ -1675,95 +1675,95 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Validator index out of bounds.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Candidate submitted but para not scheduled.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Head data exceeds the configured maximum.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Code upgrade prematurely.
      **/
-    PrematureCodeUpgrade: GenericPalletError<Rv>;
+    PrematureCodeUpgrade: GenericPalletError;
 
     /**
      * Output code is too large
      **/
-    NewCodeTooLarge: GenericPalletError<Rv>;
+    NewCodeTooLarge: GenericPalletError;
 
     /**
      * The candidate's relay-parent was not allowed. Either it was
      * not recent enough or it didn't advance based on the last parachain block.
      **/
-    DisallowedRelayParent: GenericPalletError<Rv>;
+    DisallowedRelayParent: GenericPalletError;
 
     /**
      * Failed to compute group index for the core: either it's out of bounds
      * or the relay parent doesn't belong to the current session.
      **/
-    InvalidAssignment: GenericPalletError<Rv>;
+    InvalidAssignment: GenericPalletError;
 
     /**
      * Invalid group index in core assignment.
      **/
-    InvalidGroupIndex: GenericPalletError<Rv>;
+    InvalidGroupIndex: GenericPalletError;
 
     /**
      * Insufficient (non-majority) backing.
      **/
-    InsufficientBacking: GenericPalletError<Rv>;
+    InsufficientBacking: GenericPalletError;
 
     /**
      * Invalid (bad signature, unknown validator, etc.) backing.
      **/
-    InvalidBacking: GenericPalletError<Rv>;
+    InvalidBacking: GenericPalletError;
 
     /**
      * The validation data hash does not match expected.
      **/
-    ValidationDataHashMismatch: GenericPalletError<Rv>;
+    ValidationDataHashMismatch: GenericPalletError;
 
     /**
      * The downward message queue is not processed correctly.
      **/
-    IncorrectDownwardMessageHandling: GenericPalletError<Rv>;
+    IncorrectDownwardMessageHandling: GenericPalletError;
 
     /**
      * At least one upward message sent does not pass the acceptance criteria.
      **/
-    InvalidUpwardMessages: GenericPalletError<Rv>;
+    InvalidUpwardMessages: GenericPalletError;
 
     /**
      * The candidate didn't follow the rules of HRMP watermark advancement.
      **/
-    HrmpWatermarkMishandling: GenericPalletError<Rv>;
+    HrmpWatermarkMishandling: GenericPalletError;
 
     /**
      * The HRMP messages sent by the candidate is not valid.
      **/
-    InvalidOutboundHrmp: GenericPalletError<Rv>;
+    InvalidOutboundHrmp: GenericPalletError;
 
     /**
      * The validation code hash of the candidate is not valid.
      **/
-    InvalidValidationCodeHash: GenericPalletError<Rv>;
+    InvalidValidationCodeHash: GenericPalletError;
 
     /**
      * The `para_head` hash in the candidate descriptor doesn't match the hash of the actual
      * para head in the commitments.
      **/
-    ParaHeadMismatch: GenericPalletError<Rv>;
+    ParaHeadMismatch: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParaInherent`'s errors
@@ -1772,29 +1772,29 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Inclusion inherent called more than once per block.
      **/
-    TooManyInclusionInherents: GenericPalletError<Rv>;
+    TooManyInclusionInherents: GenericPalletError;
 
     /**
      * The hash of the submitted parent header doesn't correspond to the saved block hash of
      * the parent.
      **/
-    InvalidParentHeader: GenericPalletError<Rv>;
+    InvalidParentHeader: GenericPalletError;
 
     /**
      * Inherent data was filtered during execution. This should have only been done
      * during creation.
      **/
-    InherentDataFilteredDuringExecution: GenericPalletError<Rv>;
+    InherentDataFilteredDuringExecution: GenericPalletError;
 
     /**
      * Too many candidates supplied.
      **/
-    UnscheduledCandidate: GenericPalletError<Rv>;
+    UnscheduledCandidate: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Paras`'s errors
@@ -1803,87 +1803,87 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Para is not registered in our system.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * Para cannot be onboarded because it is already tracked by our system.
      **/
-    CannotOnboard: GenericPalletError<Rv>;
+    CannotOnboard: GenericPalletError;
 
     /**
      * Para cannot be offboarded at this time.
      **/
-    CannotOffboard: GenericPalletError<Rv>;
+    CannotOffboard: GenericPalletError;
 
     /**
      * Para cannot be upgraded to a lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para cannot be downgraded to an on-demand parachain.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is stale.
      **/
-    PvfCheckStatementStale: GenericPalletError<Rv>;
+    PvfCheckStatementStale: GenericPalletError;
 
     /**
      * The statement for PVF pre-checking is for a future session.
      **/
-    PvfCheckStatementFuture: GenericPalletError<Rv>;
+    PvfCheckStatementFuture: GenericPalletError;
 
     /**
      * Claimed validator index is out of bounds.
      **/
-    PvfCheckValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    PvfCheckValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * The signature for the PVF pre-checking is invalid.
      **/
-    PvfCheckInvalidSignature: GenericPalletError<Rv>;
+    PvfCheckInvalidSignature: GenericPalletError;
 
     /**
      * The given validator already has cast a vote.
      **/
-    PvfCheckDoubleVote: GenericPalletError<Rv>;
+    PvfCheckDoubleVote: GenericPalletError;
 
     /**
      * The given PVF does not exist at the moment of process a vote.
      **/
-    PvfCheckSubjectInvalid: GenericPalletError<Rv>;
+    PvfCheckSubjectInvalid: GenericPalletError;
 
     /**
      * Parachain cannot currently schedule a code upgrade.
      **/
-    CannotUpgradeCode: GenericPalletError<Rv>;
+    CannotUpgradeCode: GenericPalletError;
 
     /**
      * Invalid validation code size.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * No upgrade authorized.
      **/
-    NothingAuthorized: GenericPalletError<Rv>;
+    NothingAuthorized: GenericPalletError;
 
     /**
      * The submitted code is not authorized.
      **/
-    Unauthorized: GenericPalletError<Rv>;
+    Unauthorized: GenericPalletError;
 
     /**
      * Invalid block number.
      **/
-    InvalidBlockNumber: GenericPalletError<Rv>;
+    InvalidBlockNumber: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Hrmp`'s errors
@@ -1892,107 +1892,107 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The sender tried to open a channel to themselves.
      **/
-    OpenHrmpChannelToSelf: GenericPalletError<Rv>;
+    OpenHrmpChannelToSelf: GenericPalletError;
 
     /**
      * The recipient is not a valid para.
      **/
-    OpenHrmpChannelInvalidRecipient: GenericPalletError<Rv>;
+    OpenHrmpChannelInvalidRecipient: GenericPalletError;
 
     /**
      * The requested capacity is zero.
      **/
-    OpenHrmpChannelZeroCapacity: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroCapacity: GenericPalletError;
 
     /**
      * The requested capacity exceeds the global limit.
      **/
-    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelCapacityExceedsLimit: GenericPalletError;
 
     /**
      * The requested maximum message size is 0.
      **/
-    OpenHrmpChannelZeroMessageSize: GenericPalletError<Rv>;
+    OpenHrmpChannelZeroMessageSize: GenericPalletError;
 
     /**
      * The open request requested the message size that exceeds the global limit.
      **/
-    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError<Rv>;
+    OpenHrmpChannelMessageSizeExceedsLimit: GenericPalletError;
 
     /**
      * The channel already exists
      **/
-    OpenHrmpChannelAlreadyExists: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyExists: GenericPalletError;
 
     /**
      * There is already a request to open the same channel.
      **/
-    OpenHrmpChannelAlreadyRequested: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyRequested: GenericPalletError;
 
     /**
      * The sender already has the maximum number of allowed outbound channels.
      **/
-    OpenHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    OpenHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The channel from the sender to the origin doesn't exist.
      **/
-    AcceptHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    AcceptHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel is already confirmed.
      **/
-    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    AcceptHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The recipient already has the maximum number of allowed inbound channels.
      **/
-    AcceptHrmpChannelLimitExceeded: GenericPalletError<Rv>;
+    AcceptHrmpChannelLimitExceeded: GenericPalletError;
 
     /**
      * The origin tries to close a channel where it is neither the sender nor the recipient.
      **/
-    CloseHrmpChannelUnauthorized: GenericPalletError<Rv>;
+    CloseHrmpChannelUnauthorized: GenericPalletError;
 
     /**
      * The channel to be closed doesn't exist.
      **/
-    CloseHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    CloseHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * The channel close request is already requested.
      **/
-    CloseHrmpChannelAlreadyUnderway: GenericPalletError<Rv>;
+    CloseHrmpChannelAlreadyUnderway: GenericPalletError;
 
     /**
      * Canceling is requested by neither the sender nor recipient of the open channel request.
      **/
-    CancelHrmpOpenChannelUnauthorized: GenericPalletError<Rv>;
+    CancelHrmpOpenChannelUnauthorized: GenericPalletError;
 
     /**
      * The open request doesn't exist.
      **/
-    OpenHrmpChannelDoesntExist: GenericPalletError<Rv>;
+    OpenHrmpChannelDoesntExist: GenericPalletError;
 
     /**
      * Cannot cancel an HRMP open channel request because it is already confirmed.
      **/
-    OpenHrmpChannelAlreadyConfirmed: GenericPalletError<Rv>;
+    OpenHrmpChannelAlreadyConfirmed: GenericPalletError;
 
     /**
      * The provided witness data is wrong.
      **/
-    WrongWitness: GenericPalletError<Rv>;
+    WrongWitness: GenericPalletError;
 
     /**
      * The channel between these two chains cannot be authorized.
      **/
-    ChannelCreationNotAuthorized: GenericPalletError<Rv>;
+    ChannelCreationNotAuthorized: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasDisputes`'s errors
@@ -2001,52 +2001,52 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Duplicate dispute statement sets provided.
      **/
-    DuplicateDisputeStatementSets: GenericPalletError<Rv>;
+    DuplicateDisputeStatementSets: GenericPalletError;
 
     /**
      * Ancient dispute statement provided.
      **/
-    AncientDisputeStatement: GenericPalletError<Rv>;
+    AncientDisputeStatement: GenericPalletError;
 
     /**
      * Validator index on statement is out of bounds for session.
      **/
-    ValidatorIndexOutOfBounds: GenericPalletError<Rv>;
+    ValidatorIndexOutOfBounds: GenericPalletError;
 
     /**
      * Invalid signature on statement.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * Validator vote submitted more than once to dispute.
      **/
-    DuplicateStatement: GenericPalletError<Rv>;
+    DuplicateStatement: GenericPalletError;
 
     /**
      * A dispute where there are only votes on one side.
      **/
-    SingleSidedDispute: GenericPalletError<Rv>;
+    SingleSidedDispute: GenericPalletError;
 
     /**
      * A dispute vote from a malicious backer.
      **/
-    MaliciousBacker: GenericPalletError<Rv>;
+    MaliciousBacker: GenericPalletError;
 
     /**
      * No backing votes were provides along dispute statements.
      **/
-    MissingBackingVotes: GenericPalletError<Rv>;
+    MissingBackingVotes: GenericPalletError;
 
     /**
      * Unconfirmed dispute statement sets provided.
      **/
-    UnconfirmedDispute: GenericPalletError<Rv>;
+    UnconfirmedDispute: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasSlashing`'s errors
@@ -2055,38 +2055,38 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The key ownership proof is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * The session index is too old or invalid.
      **/
-    InvalidSessionIndex: GenericPalletError<Rv>;
+    InvalidSessionIndex: GenericPalletError;
 
     /**
      * The candidate hash is invalid.
      **/
-    InvalidCandidateHash: GenericPalletError<Rv>;
+    InvalidCandidateHash: GenericPalletError;
 
     /**
      * There is no pending slash for the given validator index and time
      * slot.
      **/
-    InvalidValidatorIndex: GenericPalletError<Rv>;
+    InvalidValidatorIndex: GenericPalletError;
 
     /**
      * The validator index does not match the validator id.
      **/
-    ValidatorIndexIdMismatch: GenericPalletError<Rv>;
+    ValidatorIndexIdMismatch: GenericPalletError;
 
     /**
      * The given slashing report is valid but already previously reported.
      **/
-    DuplicateSlashingReport: GenericPalletError<Rv>;
+    DuplicateSlashingReport: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s errors
@@ -2095,40 +2095,40 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The order queue is full, `place_order` will not continue.
      **/
-    QueueFull: GenericPalletError<Rv>;
+    QueueFull: GenericPalletError;
 
     /**
      * The current spot price is higher than the max amount specified in the `place_order`
      * call, making it invalid.
      **/
-    SpotPriceHigherThanMaxAmount: GenericPalletError<Rv>;
+    SpotPriceHigherThanMaxAmount: GenericPalletError;
 
     /**
      * The account doesn't have enough credits to purchase on-demand coretime.
      **/
-    InsufficientCredits: GenericPalletError<Rv>;
+    InsufficientCredits: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s errors
    **/
   coretimeAssignmentProvider: {
-    AssignmentsEmpty: GenericPalletError<Rv>;
+    AssignmentsEmpty: GenericPalletError;
 
     /**
      * assign_core is only allowed to append new assignments at the end of already existing
      * ones or update the last entry.
      **/
-    DisallowedInsert: GenericPalletError<Rv>;
+    DisallowedInsert: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Registrar`'s errors
@@ -2137,79 +2137,79 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The ID is not registered.
      **/
-    NotRegistered: GenericPalletError<Rv>;
+    NotRegistered: GenericPalletError;
 
     /**
      * The ID is already registered.
      **/
-    AlreadyRegistered: GenericPalletError<Rv>;
+    AlreadyRegistered: GenericPalletError;
 
     /**
      * The caller is not the owner of this Id.
      **/
-    NotOwner: GenericPalletError<Rv>;
+    NotOwner: GenericPalletError;
 
     /**
      * Invalid para code size.
      **/
-    CodeTooLarge: GenericPalletError<Rv>;
+    CodeTooLarge: GenericPalletError;
 
     /**
      * Invalid para head data size.
      **/
-    HeadDataTooLarge: GenericPalletError<Rv>;
+    HeadDataTooLarge: GenericPalletError;
 
     /**
      * Para is not a Parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Para is not a Parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Cannot deregister para
      **/
-    CannotDeregister: GenericPalletError<Rv>;
+    CannotDeregister: GenericPalletError;
 
     /**
      * Cannot schedule downgrade of lease holding parachain to on-demand parachain
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * Cannot schedule upgrade of on-demand parachain to lease holding parachain
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Para is locked from manipulation by the manager. Must use parachain or relay chain
      * governance.
      **/
-    ParaLocked: GenericPalletError<Rv>;
+    ParaLocked: GenericPalletError;
 
     /**
      * The ID given for registration has not been reserved.
      **/
-    NotReserved: GenericPalletError<Rv>;
+    NotReserved: GenericPalletError;
 
     /**
      * The validation code is invalid.
      **/
-    InvalidCode: GenericPalletError<Rv>;
+    InvalidCode: GenericPalletError;
 
     /**
      * Cannot perform a parachain slot / lifecycle swap. Check that the state of both paras
      * are correct for the swap to work.
      **/
-    CannotSwap: GenericPalletError<Rv>;
+    CannotSwap: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Slots`'s errors
@@ -2218,17 +2218,17 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The parachain ID is not onboarding.
      **/
-    ParaNotOnboarding: GenericPalletError<Rv>;
+    ParaNotOnboarding: GenericPalletError;
 
     /**
      * There was an error with the lease.
      **/
-    LeaseError: GenericPalletError<Rv>;
+    LeaseError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `ParasSudoWrapper`'s errors
@@ -2237,58 +2237,58 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The specified parachain is not registered.
      **/
-    ParaDoesntExist: GenericPalletError<Rv>;
+    ParaDoesntExist: GenericPalletError;
 
     /**
      * The specified parachain is already registered.
      **/
-    ParaAlreadyExists: GenericPalletError<Rv>;
+    ParaAlreadyExists: GenericPalletError;
 
     /**
      * A DMP message couldn't be sent because it exceeds the maximum size allowed for a
      * downward message.
      **/
-    ExceedsMaxMessageSize: GenericPalletError<Rv>;
+    ExceedsMaxMessageSize: GenericPalletError;
 
     /**
      * A DMP message couldn't be sent because the destination is unreachable.
      **/
-    Unroutable: GenericPalletError<Rv>;
+    Unroutable: GenericPalletError;
 
     /**
      * Could not schedule para cleanup.
      **/
-    CouldntCleanup: GenericPalletError<Rv>;
+    CouldntCleanup: GenericPalletError;
 
     /**
      * Not a parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Not a lease holding parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * Cannot upgrade on-demand parachain to lease holding parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Cannot downgrade lease holding parachain to on-demand.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * There are more cores than supported by the runtime.
      **/
-    TooManyCores: GenericPalletError<Rv>;
+    TooManyCores: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Auctions`'s errors
@@ -2297,42 +2297,42 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * This auction is already in progress.
      **/
-    AuctionInProgress: GenericPalletError<Rv>;
+    AuctionInProgress: GenericPalletError;
 
     /**
      * The lease period is in the past.
      **/
-    LeasePeriodInPast: GenericPalletError<Rv>;
+    LeasePeriodInPast: GenericPalletError;
 
     /**
      * Para is not registered
      **/
-    ParaNotRegistered: GenericPalletError<Rv>;
+    ParaNotRegistered: GenericPalletError;
 
     /**
      * Not a current auction.
      **/
-    NotCurrentAuction: GenericPalletError<Rv>;
+    NotCurrentAuction: GenericPalletError;
 
     /**
      * Not an auction.
      **/
-    NotAuction: GenericPalletError<Rv>;
+    NotAuction: GenericPalletError;
 
     /**
      * Auction has already ended.
      **/
-    AuctionEnded: GenericPalletError<Rv>;
+    AuctionEnded: GenericPalletError;
 
     /**
      * The para is already leased out for part of this range.
      **/
-    AlreadyLeasedOut: GenericPalletError<Rv>;
+    AlreadyLeasedOut: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Crowdloan`'s errors
@@ -2341,123 +2341,123 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The current lease period is more than the first lease period.
      **/
-    FirstPeriodInPast: GenericPalletError<Rv>;
+    FirstPeriodInPast: GenericPalletError;
 
     /**
      * The first lease period needs to at least be less than 3 `max_value`.
      **/
-    FirstPeriodTooFarInFuture: GenericPalletError<Rv>;
+    FirstPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * Last lease period must be greater than first lease period.
      **/
-    LastPeriodBeforeFirstPeriod: GenericPalletError<Rv>;
+    LastPeriodBeforeFirstPeriod: GenericPalletError;
 
     /**
      * The last lease period cannot be more than 3 periods after the first period.
      **/
-    LastPeriodTooFarInFuture: GenericPalletError<Rv>;
+    LastPeriodTooFarInFuture: GenericPalletError;
 
     /**
      * The campaign ends before the current block number. The end must be in the future.
      **/
-    CannotEndInPast: GenericPalletError<Rv>;
+    CannotEndInPast: GenericPalletError;
 
     /**
      * The end date for this crowdloan is not sensible.
      **/
-    EndTooFarInFuture: GenericPalletError<Rv>;
+    EndTooFarInFuture: GenericPalletError;
 
     /**
      * There was an overflow.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * The contribution was below the minimum, `MinContribution`.
      **/
-    ContributionTooSmall: GenericPalletError<Rv>;
+    ContributionTooSmall: GenericPalletError;
 
     /**
      * Invalid fund index.
      **/
-    InvalidParaId: GenericPalletError<Rv>;
+    InvalidParaId: GenericPalletError;
 
     /**
      * Contributions exceed maximum amount.
      **/
-    CapExceeded: GenericPalletError<Rv>;
+    CapExceeded: GenericPalletError;
 
     /**
      * The contribution period has already ended.
      **/
-    ContributionPeriodOver: GenericPalletError<Rv>;
+    ContributionPeriodOver: GenericPalletError;
 
     /**
      * The origin of this call is invalid.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * This crowdloan does not correspond to a parachain.
      **/
-    NotParachain: GenericPalletError<Rv>;
+    NotParachain: GenericPalletError;
 
     /**
      * This parachain lease is still active and retirement cannot yet begin.
      **/
-    LeaseActive: GenericPalletError<Rv>;
+    LeaseActive: GenericPalletError;
 
     /**
      * This parachain's bid or lease is still active and withdraw cannot yet begin.
      **/
-    BidOrLeaseActive: GenericPalletError<Rv>;
+    BidOrLeaseActive: GenericPalletError;
 
     /**
      * The crowdloan has not yet ended.
      **/
-    FundNotEnded: GenericPalletError<Rv>;
+    FundNotEnded: GenericPalletError;
 
     /**
      * There are no contributions stored in this crowdloan.
      **/
-    NoContributions: GenericPalletError<Rv>;
+    NoContributions: GenericPalletError;
 
     /**
      * The crowdloan is not ready to dissolve. Potentially still has a slot or in retirement
      * period.
      **/
-    NotReadyToDissolve: GenericPalletError<Rv>;
+    NotReadyToDissolve: GenericPalletError;
 
     /**
      * Invalid signature.
      **/
-    InvalidSignature: GenericPalletError<Rv>;
+    InvalidSignature: GenericPalletError;
 
     /**
      * The provided memo is too large.
      **/
-    MemoTooLarge: GenericPalletError<Rv>;
+    MemoTooLarge: GenericPalletError;
 
     /**
      * The fund is already in `NewRaise`
      **/
-    AlreadyInNewRaise: GenericPalletError<Rv>;
+    AlreadyInNewRaise: GenericPalletError;
 
     /**
      * No contributions allowed during the VRF delay
      **/
-    VrfDelayInProgress: GenericPalletError<Rv>;
+    VrfDelayInProgress: GenericPalletError;
 
     /**
      * A lease period has not started yet, due to an offset in the starting block.
      **/
-    NoLeasePeriod: GenericPalletError<Rv>;
+    NoLeasePeriod: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssignedSlots`'s errors
@@ -2466,46 +2466,46 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The specified parachain is not registered.
      **/
-    ParaDoesntExist: GenericPalletError<Rv>;
+    ParaDoesntExist: GenericPalletError;
 
     /**
      * Not a parathread (on-demand parachain).
      **/
-    NotParathread: GenericPalletError<Rv>;
+    NotParathread: GenericPalletError;
 
     /**
      * Cannot upgrade on-demand parachain to lease holding
      * parachain.
      **/
-    CannotUpgrade: GenericPalletError<Rv>;
+    CannotUpgrade: GenericPalletError;
 
     /**
      * Cannot downgrade lease holding parachain to
      * on-demand.
      **/
-    CannotDowngrade: GenericPalletError<Rv>;
+    CannotDowngrade: GenericPalletError;
 
     /**
      * Permanent or Temporary slot already assigned.
      **/
-    SlotAlreadyAssigned: GenericPalletError<Rv>;
+    SlotAlreadyAssigned: GenericPalletError;
 
     /**
      * Permanent or Temporary slot has not been assigned.
      **/
-    SlotNotAssigned: GenericPalletError<Rv>;
+    SlotNotAssigned: GenericPalletError;
 
     /**
      * An ongoing lease already exists.
      **/
-    OngoingLeaseExists: GenericPalletError<Rv>;
-    MaxPermanentSlotsExceeded: GenericPalletError<Rv>;
-    MaxTemporarySlotsExceeded: GenericPalletError<Rv>;
+    OngoingLeaseExists: GenericPalletError;
+    MaxPermanentSlotsExceeded: GenericPalletError;
+    MaxTemporarySlotsExceeded: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Coretime`'s errors
@@ -2514,23 +2514,23 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The paraid making the call is not the coretime brokerage system parachain.
      **/
-    NotBroker: GenericPalletError<Rv>;
+    NotBroker: GenericPalletError;
 
     /**
      * Requested revenue information `when` parameter was in the future from the current
      * block height.
      **/
-    RequestedFutureRevenue: GenericPalletError<Rv>;
+    RequestedFutureRevenue: GenericPalletError;
 
     /**
      * Failed to transfer assets to the coretime chain
      **/
-    AssetTransferFailed: GenericPalletError<Rv>;
+    AssetTransferFailed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `StakingAhClient`'s errors
@@ -2539,12 +2539,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Could not process incoming message because incoming messages are blocked.
      **/
-    Blocked: GenericPalletError<Rv>;
+    Blocked: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MultiBlockMigrations`'s errors
@@ -2553,12 +2553,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The operation cannot complete since some MBMs are ongoing.
      **/
-    Ongoing: GenericPalletError<Rv>;
+    Ongoing: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `XcmPallet`'s errors
@@ -2568,152 +2568,152 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * The desired destination was unreachable, generally because there is a no way of routing
      * to it.
      **/
-    Unreachable: GenericPalletError<Rv>;
+    Unreachable: GenericPalletError;
 
     /**
      * There was some other issue (i.e. not to do with routing) in sending the message.
      * Perhaps a lack of space for buffering the message.
      **/
-    SendFailure: GenericPalletError<Rv>;
+    SendFailure: GenericPalletError;
 
     /**
      * The message execution fails the filter.
      **/
-    Filtered: GenericPalletError<Rv>;
+    Filtered: GenericPalletError;
 
     /**
      * The message's weight could not be determined.
      **/
-    UnweighableMessage: GenericPalletError<Rv>;
+    UnweighableMessage: GenericPalletError;
 
     /**
      * The destination `Location` provided cannot be inverted.
      **/
-    DestinationNotInvertible: GenericPalletError<Rv>;
+    DestinationNotInvertible: GenericPalletError;
 
     /**
      * The assets to be sent are empty.
      **/
-    Empty: GenericPalletError<Rv>;
+    Empty: GenericPalletError;
 
     /**
      * Could not re-anchor the assets to declare the fees for the destination chain.
      **/
-    CannotReanchor: GenericPalletError<Rv>;
+    CannotReanchor: GenericPalletError;
 
     /**
      * Too many assets have been attempted for transfer.
      **/
-    TooManyAssets: GenericPalletError<Rv>;
+    TooManyAssets: GenericPalletError;
 
     /**
      * Origin is invalid for sending.
      **/
-    InvalidOrigin: GenericPalletError<Rv>;
+    InvalidOrigin: GenericPalletError;
 
     /**
      * The version of the `Versioned` value used is not able to be interpreted.
      **/
-    BadVersion: GenericPalletError<Rv>;
+    BadVersion: GenericPalletError;
 
     /**
      * The given location could not be used (e.g. because it cannot be expressed in the
      * desired version of XCM).
      **/
-    BadLocation: GenericPalletError<Rv>;
+    BadLocation: GenericPalletError;
 
     /**
      * The referenced subscription could not be found.
      **/
-    NoSubscription: GenericPalletError<Rv>;
+    NoSubscription: GenericPalletError;
 
     /**
      * The location is invalid since it already has a subscription from us.
      **/
-    AlreadySubscribed: GenericPalletError<Rv>;
+    AlreadySubscribed: GenericPalletError;
 
     /**
      * Could not check-out the assets for teleportation to the destination chain.
      **/
-    CannotCheckOutTeleport: GenericPalletError<Rv>;
+    CannotCheckOutTeleport: GenericPalletError;
 
     /**
      * The owner does not own (all) of the asset that they wish to do the operation on.
      **/
-    LowBalance: GenericPalletError<Rv>;
+    LowBalance: GenericPalletError;
 
     /**
      * The asset owner has too many locks on the asset.
      **/
-    TooManyLocks: GenericPalletError<Rv>;
+    TooManyLocks: GenericPalletError;
 
     /**
      * The given account is not an identifiable sovereign account for any location.
      **/
-    AccountNotSovereign: GenericPalletError<Rv>;
+    AccountNotSovereign: GenericPalletError;
 
     /**
      * The operation required fees to be paid which the initiator could not meet.
      **/
-    FeesNotMet: GenericPalletError<Rv>;
+    FeesNotMet: GenericPalletError;
 
     /**
      * A remote lock with the corresponding data could not be found.
      **/
-    LockNotFound: GenericPalletError<Rv>;
+    LockNotFound: GenericPalletError;
 
     /**
      * The unlock operation cannot succeed because there are still consumers of the lock.
      **/
-    InUse: GenericPalletError<Rv>;
+    InUse: GenericPalletError;
 
     /**
      * Invalid asset, reserve chain could not be determined for it.
      **/
-    InvalidAssetUnknownReserve: GenericPalletError<Rv>;
+    InvalidAssetUnknownReserve: GenericPalletError;
 
     /**
      * Invalid asset, do not support remote asset reserves with different fees reserves.
      **/
-    InvalidAssetUnsupportedReserve: GenericPalletError<Rv>;
+    InvalidAssetUnsupportedReserve: GenericPalletError;
 
     /**
      * Too many assets with different reserve locations have been attempted for transfer.
      **/
-    TooManyReserves: GenericPalletError<Rv>;
+    TooManyReserves: GenericPalletError;
 
     /**
      * Local XCM execution incomplete.
      **/
-    LocalExecutionIncomplete: GenericPalletError<Rv>;
+    LocalExecutionIncomplete: GenericPalletError;
 
     /**
      * Too many locations authorized to alias origin.
      *
      * @deprecated Use `LocalExecutionIncompleteWithError` instead (since 20.0.0)
      **/
-    TooManyAuthorizedAliases: GenericPalletError<Rv>;
+    TooManyAuthorizedAliases: GenericPalletError;
 
     /**
      * Expiry block number is in the past.
      **/
-    ExpiresInPast: GenericPalletError<Rv>;
+    ExpiresInPast: GenericPalletError;
 
     /**
      * The alias to remove authorization for was not found.
      **/
-    AliasNotFound: GenericPalletError<Rv>;
+    AliasNotFound: GenericPalletError;
 
     /**
      * Local XCM execution incomplete with the actual XCM error and the index of the
      * instruction that caused the error.
      **/
-    LocalExecutionIncompleteWithError: GenericPalletError<Rv>;
+    LocalExecutionIncompleteWithError: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MessageQueue`'s errors
@@ -2723,32 +2723,32 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Page is not reapable because it has items remaining to be processed and is not old
      * enough.
      **/
-    NotReapable: GenericPalletError<Rv>;
+    NotReapable: GenericPalletError;
 
     /**
      * Page to be reaped does not exist.
      **/
-    NoPage: GenericPalletError<Rv>;
+    NoPage: GenericPalletError;
 
     /**
      * The referenced message could not be found.
      **/
-    NoMessage: GenericPalletError<Rv>;
+    NoMessage: GenericPalletError;
 
     /**
      * The message was already processed and cannot be processed again.
      **/
-    AlreadyProcessed: GenericPalletError<Rv>;
+    AlreadyProcessed: GenericPalletError;
 
     /**
      * The message is queued for future execution.
      **/
-    Queued: GenericPalletError<Rv>;
+    Queued: GenericPalletError;
 
     /**
      * There is temporarily not enough weight to continue servicing messages.
      **/
-    InsufficientWeight: GenericPalletError<Rv>;
+    InsufficientWeight: GenericPalletError;
 
     /**
      * This message is temporarily unprocessable.
@@ -2756,24 +2756,24 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
      * Such errors are expected, but not guaranteed, to resolve themselves eventually through
      * retrying.
      **/
-    TemporarilyUnprocessable: GenericPalletError<Rv>;
+    TemporarilyUnprocessable: GenericPalletError;
 
     /**
      * The queue is paused and no message can be executed from it.
      *
      * This can change at any time and may resolve in the future by re-trying.
      **/
-    QueuePaused: GenericPalletError<Rv>;
+    QueuePaused: GenericPalletError;
 
     /**
      * Another call is in progress and needs to finish before this call can happen.
      **/
-    RecursiveDisallowed: GenericPalletError<Rv>;
+    RecursiveDisallowed: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `AssetRate`'s errors
@@ -2782,22 +2782,22 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * The given asset ID is unknown.
      **/
-    UnknownAssetKind: GenericPalletError<Rv>;
+    UnknownAssetKind: GenericPalletError;
 
     /**
      * The given asset ID already has an assigned conversion rate and cannot be re-created.
      **/
-    AlreadyExists: GenericPalletError<Rv>;
+    AlreadyExists: GenericPalletError;
 
     /**
      * Overflow ocurred when calculating the inverse rate.
      **/
-    Overflow: GenericPalletError<Rv>;
+    Overflow: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `MetaTx`'s errors
@@ -2806,37 +2806,37 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Invalid proof (e.g. signature).
      **/
-    BadProof: GenericPalletError<Rv>;
+    BadProof: GenericPalletError;
 
     /**
      * The meta transaction is not yet valid (e.g. nonce too high).
      **/
-    Future: GenericPalletError<Rv>;
+    Future: GenericPalletError;
 
     /**
      * The meta transaction is outdated (e.g. nonce too low).
      **/
-    Stale: GenericPalletError<Rv>;
+    Stale: GenericPalletError;
 
     /**
      * The meta transactions's birth block is ancient.
      **/
-    AncientBirthBlock: GenericPalletError<Rv>;
+    AncientBirthBlock: GenericPalletError;
 
     /**
      * The transaction extension did not authorize any origin.
      **/
-    UnknownOrigin: GenericPalletError<Rv>;
+    UnknownOrigin: GenericPalletError;
 
     /**
      * The meta transaction is invalid.
      **/
-    Invalid: GenericPalletError<Rv>;
+    Invalid: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `RootOffences`'s errors
@@ -2845,12 +2845,12 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * Failed to get the active era from the staking pallet.
      **/
-    FailedToGetActiveEra: GenericPalletError<Rv>;
+    FailedToGetActiveEra: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
   /**
    * Pallet `Beefy`'s errors
@@ -2859,41 +2859,41 @@ export interface ChainErrors<Rv extends RpcVersion> extends GenericChainErrors<R
     /**
      * A key ownership proof provided as part of an equivocation report is invalid.
      **/
-    InvalidKeyOwnershipProof: GenericPalletError<Rv>;
+    InvalidKeyOwnershipProof: GenericPalletError;
 
     /**
      * A double voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidDoubleVotingProof: GenericPalletError<Rv>;
+    InvalidDoubleVotingProof: GenericPalletError;
 
     /**
      * A fork voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidForkVotingProof: GenericPalletError<Rv>;
+    InvalidForkVotingProof: GenericPalletError;
 
     /**
      * A future block voting proof provided as part of an equivocation report is invalid.
      **/
-    InvalidFutureBlockVotingProof: GenericPalletError<Rv>;
+    InvalidFutureBlockVotingProof: GenericPalletError;
 
     /**
      * The session of the equivocation proof is invalid
      **/
-    InvalidEquivocationProofSession: GenericPalletError<Rv>;
+    InvalidEquivocationProofSession: GenericPalletError;
 
     /**
      * A given equivocation report is valid but already previously reported.
      **/
-    DuplicateOffenceReport: GenericPalletError<Rv>;
+    DuplicateOffenceReport: GenericPalletError;
 
     /**
      * Submitted configuration is invalid.
      **/
-    InvalidConfiguration: GenericPalletError<Rv>;
+    InvalidConfiguration: GenericPalletError;
 
     /**
      * Generic pallet error
      **/
-    [error: string]: GenericPalletError<Rv>;
+    [error: string]: GenericPalletError;
   };
 }
diff --git a/packages/chaintypes/src/westend/events.d.ts b/packages/chaintypes/src/westend/events.d.ts
index d82d49c9..7210b2b0 100644
--- a/packages/chaintypes/src/westend/events.d.ts
+++ b/packages/chaintypes/src/westend/events.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainEvents, GenericPalletEvent, RpcVersion } from 'dedot/types';
+import type { GenericChainEvents, GenericPalletEvent } from 'dedot/types';
 import type { DispatchError, AccountId32, H256, Perbill, FixedBytes, Bytes, Result, FixedU128 } from 'dedot/codecs';
 import type {
   FrameSystemDispatchEventInfo,
@@ -55,7 +55,7 @@ import type {
   FrameSupportMessagesProcessMessageError,
 } from './types.js';
 
-export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<Rv> {
+export interface ChainEvents extends GenericChainEvents {
   /**
    * Pallet `System`'s events
    **/
@@ -63,18 +63,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An extrinsic completed successfully.
      **/
-    ExtrinsicSuccess: GenericPalletEvent<
-      Rv,
-      'System',
-      'ExtrinsicSuccess',
-      { dispatchInfo: FrameSystemDispatchEventInfo }
-    >;
+    ExtrinsicSuccess: GenericPalletEvent<'System', 'ExtrinsicSuccess', { dispatchInfo: FrameSystemDispatchEventInfo }>;
 
     /**
      * An extrinsic failed.
      **/
     ExtrinsicFailed: GenericPalletEvent<
-      Rv,
       'System',
       'ExtrinsicFailed',
       { dispatchError: DispatchError; dispatchInfo: FrameSystemDispatchEventInfo }
@@ -83,33 +77,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * `:code` was updated.
      **/
-    CodeUpdated: GenericPalletEvent<Rv, 'System', 'CodeUpdated', null>;
+    CodeUpdated: GenericPalletEvent<'System', 'CodeUpdated', null>;
 
     /**
      * A new account was created.
      **/
-    NewAccount: GenericPalletEvent<Rv, 'System', 'NewAccount', { account: AccountId32 }>;
+    NewAccount: GenericPalletEvent<'System', 'NewAccount', { account: AccountId32 }>;
 
     /**
      * An account was reaped.
      **/
-    KilledAccount: GenericPalletEvent<Rv, 'System', 'KilledAccount', { account: AccountId32 }>;
+    KilledAccount: GenericPalletEvent<'System', 'KilledAccount', { account: AccountId32 }>;
 
     /**
      * On on-chain remark happened.
      **/
-    Remarked: GenericPalletEvent<Rv, 'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
+    Remarked: GenericPalletEvent<'System', 'Remarked', { sender: AccountId32; hash: H256 }>;
 
     /**
      * An upgrade was authorized.
      **/
-    UpgradeAuthorized: GenericPalletEvent<Rv, 'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
+    UpgradeAuthorized: GenericPalletEvent<'System', 'UpgradeAuthorized', { codeHash: H256; checkVersion: boolean }>;
 
     /**
      * An invalid authorized upgrade was rejected while trying to apply it.
      **/
     RejectedInvalidAuthorizedUpgrade: GenericPalletEvent<
-      Rv,
       'System',
       'RejectedInvalidAuthorizedUpgrade',
       { codeHash: H256; error: DispatchError }
@@ -118,7 +111,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Indices`'s events
@@ -127,23 +120,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A account index was assigned.
      **/
-    IndexAssigned: GenericPalletEvent<Rv, 'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
+    IndexAssigned: GenericPalletEvent<'Indices', 'IndexAssigned', { who: AccountId32; index: number }>;
 
     /**
      * A account index has been freed up (unassigned).
      **/
-    IndexFreed: GenericPalletEvent<Rv, 'Indices', 'IndexFreed', { index: number }>;
+    IndexFreed: GenericPalletEvent<'Indices', 'IndexFreed', { index: number }>;
 
     /**
      * A account index has been frozen to its current account ID.
      **/
-    IndexFrozen: GenericPalletEvent<Rv, 'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
+    IndexFrozen: GenericPalletEvent<'Indices', 'IndexFrozen', { index: number; who: AccountId32 }>;
 
     /**
      * A deposit to reserve an index has been poked/reconsidered.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Indices',
       'DepositPoked',
       { who: AccountId32; index: number; oldDeposit: bigint; newDeposit: bigint }
@@ -152,7 +144,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Balances`'s events
@@ -161,40 +153,39 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account was created with some free balance.
      **/
-    Endowed: GenericPalletEvent<Rv, 'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
+    Endowed: GenericPalletEvent<'Balances', 'Endowed', { account: AccountId32; freeBalance: bigint }>;
 
     /**
      * An account was removed whose balance was non-zero but below ExistentialDeposit,
      * resulting in an outright loss.
      **/
-    DustLost: GenericPalletEvent<Rv, 'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
+    DustLost: GenericPalletEvent<'Balances', 'DustLost', { account: AccountId32; amount: bigint }>;
 
     /**
      * Transfer succeeded.
      **/
-    Transfer: GenericPalletEvent<Rv, 'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
+    Transfer: GenericPalletEvent<'Balances', 'Transfer', { from: AccountId32; to: AccountId32; amount: bigint }>;
 
     /**
      * A balance was set by root.
      **/
-    BalanceSet: GenericPalletEvent<Rv, 'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
+    BalanceSet: GenericPalletEvent<'Balances', 'BalanceSet', { who: AccountId32; free: bigint }>;
 
     /**
      * Some balance was reserved (moved from free to reserved).
      **/
-    Reserved: GenericPalletEvent<Rv, 'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
+    Reserved: GenericPalletEvent<'Balances', 'Reserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unreserved (moved from reserved to free).
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Balances', 'Unreserved', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was moved from the reserve of the first account to the second account.
      * Final argument indicates the destination balance type.
      **/
     ReserveRepatriated: GenericPalletEvent<
-      Rv,
       'Balances',
       'ReserveRepatriated',
       { from: AccountId32; to: AccountId32; amount: bigint; destinationStatus: FrameSupportTokensMiscBalanceStatus }
@@ -203,93 +194,92 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Some amount was deposited (e.g. for transaction fees).
      **/
-    Deposit: GenericPalletEvent<Rv, 'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
+    Deposit: GenericPalletEvent<'Balances', 'Deposit', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was withdrawn from the account (e.g. for transaction fees).
      **/
-    Withdraw: GenericPalletEvent<Rv, 'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
+    Withdraw: GenericPalletEvent<'Balances', 'Withdraw', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was removed from the account (e.g. for misbehavior).
      **/
-    Slashed: GenericPalletEvent<Rv, 'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Balances', 'Slashed', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was minted into an account.
      **/
-    Minted: GenericPalletEvent<Rv, 'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
+    Minted: GenericPalletEvent<'Balances', 'Minted', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some credit was balanced and added to the TotalIssuance.
      **/
-    MintedCredit: GenericPalletEvent<Rv, 'Balances', 'MintedCredit', { amount: bigint }>;
+    MintedCredit: GenericPalletEvent<'Balances', 'MintedCredit', { amount: bigint }>;
 
     /**
      * Some amount was burned from an account.
      **/
-    Burned: GenericPalletEvent<Rv, 'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
+    Burned: GenericPalletEvent<'Balances', 'Burned', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some debt has been dropped from the Total Issuance.
      **/
-    BurnedDebt: GenericPalletEvent<Rv, 'Balances', 'BurnedDebt', { amount: bigint }>;
+    BurnedDebt: GenericPalletEvent<'Balances', 'BurnedDebt', { amount: bigint }>;
 
     /**
      * Some amount was suspended from an account (it can be restored later).
      **/
-    Suspended: GenericPalletEvent<Rv, 'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
+    Suspended: GenericPalletEvent<'Balances', 'Suspended', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some amount was restored into an account.
      **/
-    Restored: GenericPalletEvent<Rv, 'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
+    Restored: GenericPalletEvent<'Balances', 'Restored', { who: AccountId32; amount: bigint }>;
 
     /**
      * An account was upgraded.
      **/
-    Upgraded: GenericPalletEvent<Rv, 'Balances', 'Upgraded', { who: AccountId32 }>;
+    Upgraded: GenericPalletEvent<'Balances', 'Upgraded', { who: AccountId32 }>;
 
     /**
      * Total issuance was increased by `amount`, creating a credit to be balanced.
      **/
-    Issued: GenericPalletEvent<Rv, 'Balances', 'Issued', { amount: bigint }>;
+    Issued: GenericPalletEvent<'Balances', 'Issued', { amount: bigint }>;
 
     /**
      * Total issuance was decreased by `amount`, creating a debt to be balanced.
      **/
-    Rescinded: GenericPalletEvent<Rv, 'Balances', 'Rescinded', { amount: bigint }>;
+    Rescinded: GenericPalletEvent<'Balances', 'Rescinded', { amount: bigint }>;
 
     /**
      * Some balance was locked.
      **/
-    Locked: GenericPalletEvent<Rv, 'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
+    Locked: GenericPalletEvent<'Balances', 'Locked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was unlocked.
      **/
-    Unlocked: GenericPalletEvent<Rv, 'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
+    Unlocked: GenericPalletEvent<'Balances', 'Unlocked', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was frozen.
      **/
-    Frozen: GenericPalletEvent<Rv, 'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
+    Frozen: GenericPalletEvent<'Balances', 'Frozen', { who: AccountId32; amount: bigint }>;
 
     /**
      * Some balance was thawed.
      **/
-    Thawed: GenericPalletEvent<Rv, 'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
+    Thawed: GenericPalletEvent<'Balances', 'Thawed', { who: AccountId32; amount: bigint }>;
 
     /**
      * The `TotalIssuance` was forcefully changed.
      **/
-    TotalIssuanceForced: GenericPalletEvent<Rv, 'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
+    TotalIssuanceForced: GenericPalletEvent<'Balances', 'TotalIssuanceForced', { old: bigint; new: bigint }>;
 
     /**
      * Some balance was placed on hold.
      **/
     Held: GenericPalletEvent<
-      Rv,
       'Balances',
       'Held',
       { reason: WestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -299,7 +289,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Held balance was burned from an account.
      **/
     BurnedHeld: GenericPalletEvent<
-      Rv,
       'Balances',
       'BurnedHeld',
       { reason: WestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -309,7 +298,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A transfer of `amount` on hold from `source` to `dest` was initiated.
      **/
     TransferOnHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferOnHold',
       { reason: WestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; amount: bigint }
@@ -319,7 +307,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The `transferred` balance is placed on hold at the `dest` account.
      **/
     TransferAndHold: GenericPalletEvent<
-      Rv,
       'Balances',
       'TransferAndHold',
       { reason: WestendRuntimeRuntimeHoldReason; source: AccountId32; dest: AccountId32; transferred: bigint }
@@ -329,7 +316,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some balance was released from hold.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'Balances',
       'Released',
       { reason: WestendRuntimeRuntimeHoldReason; who: AccountId32; amount: bigint }
@@ -338,12 +324,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An unexpected/defensive event was triggered.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'Balances', 'Unexpected', PalletBalancesUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `TransactionPayment`'s events
@@ -354,7 +340,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * has been paid by `who`.
      **/
     TransactionFeePaid: GenericPalletEvent<
-      Rv,
       'TransactionPayment',
       'TransactionFeePaid',
       { who: AccountId32; actualFee: bigint; tip: bigint }
@@ -363,7 +348,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Staking`'s events
@@ -373,18 +358,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The era payout has been set; the first balance is the validator-payout; the second is
      * the remainder from the maximum amount of reward.
      **/
-    EraPaid: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'EraPaid',
-      { eraIndex: number; validatorPayout: bigint; remainder: bigint }
-    >;
+    EraPaid: GenericPalletEvent<'Staking', 'EraPaid', { eraIndex: number; validatorPayout: bigint; remainder: bigint }>;
 
     /**
      * The nominator has been rewarded by this amount to this destination.
      **/
     Rewarded: GenericPalletEvent<
-      Rv,
       'Staking',
       'Rewarded',
       { stash: AccountId32; dest: PalletStakingRewardDestination; amount: bigint }
@@ -393,14 +372,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker (validator or nominator) has been slashed by the given amount.
      **/
-    Slashed: GenericPalletEvent<Rv, 'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'Staking', 'Slashed', { staker: AccountId32; amount: bigint }>;
 
     /**
      * A slash for the given validator, for the given percentage of their stake, at the given
      * era as been reported.
      **/
     SlashReported: GenericPalletEvent<
-      Rv,
       'Staking',
       'SlashReported',
       { validator: AccountId32; fraction: Perbill; slashEra: number }
@@ -410,17 +388,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An old slashing report from a prior era was discarded because it could
      * not be processed.
      **/
-    OldSlashingReportDiscarded: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'OldSlashingReportDiscarded',
-      { sessionIndex: number }
-    >;
+    OldSlashingReportDiscarded: GenericPalletEvent<'Staking', 'OldSlashingReportDiscarded', { sessionIndex: number }>;
 
     /**
      * A new set of stakers was elected.
      **/
-    StakersElected: GenericPalletEvent<Rv, 'Staking', 'StakersElected', null>;
+    StakersElected: GenericPalletEvent<'Staking', 'StakersElected', null>;
 
     /**
      * An account has bonded this amount. \[stash, amount\]
@@ -428,39 +401,38 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
      * it will not be emitted for staking rewards when they are added to stake.
      **/
-    Bonded: GenericPalletEvent<Rv, 'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
+    Bonded: GenericPalletEvent<'Staking', 'Bonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has unbonded this amount.
      **/
-    Unbonded: GenericPalletEvent<Rv, 'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
+    Unbonded: GenericPalletEvent<'Staking', 'Unbonded', { stash: AccountId32; amount: bigint }>;
 
     /**
      * An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
      * from the unlocking queue.
      **/
-    Withdrawn: GenericPalletEvent<Rv, 'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
+    Withdrawn: GenericPalletEvent<'Staking', 'Withdrawn', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A nominator has been kicked from a validator.
      **/
-    Kicked: GenericPalletEvent<Rv, 'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
+    Kicked: GenericPalletEvent<'Staking', 'Kicked', { nominator: AccountId32; stash: AccountId32 }>;
 
     /**
      * The election failed. No new era is planned.
      **/
-    StakingElectionFailed: GenericPalletEvent<Rv, 'Staking', 'StakingElectionFailed', null>;
+    StakingElectionFailed: GenericPalletEvent<'Staking', 'StakingElectionFailed', null>;
 
     /**
      * An account has stopped participating as either a validator or nominator.
      **/
-    Chilled: GenericPalletEvent<Rv, 'Staking', 'Chilled', { stash: AccountId32 }>;
+    Chilled: GenericPalletEvent<'Staking', 'Chilled', { stash: AccountId32 }>;
 
     /**
      * A Page of stakers rewards are getting paid. `next` is `None` if all pages are claimed.
      **/
     PayoutStarted: GenericPalletEvent<
-      Rv,
       'Staking',
       'PayoutStarted',
       { eraIndex: number; validatorStash: AccountId32; page: number; next?: number | undefined }
@@ -470,7 +442,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A validator has set their preferences.
      **/
     ValidatorPrefsSet: GenericPalletEvent<
-      Rv,
       'Staking',
       'ValidatorPrefsSet',
       { stash: AccountId32; prefs: PalletStakingValidatorPrefs }
@@ -479,38 +450,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Voters size limit reached.
      **/
-    SnapshotVotersSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
+    SnapshotVotersSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotVotersSizeExceeded', { size: number }>;
 
     /**
      * Targets size limit reached.
      **/
-    SnapshotTargetsSizeExceeded: GenericPalletEvent<Rv, 'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
+    SnapshotTargetsSizeExceeded: GenericPalletEvent<'Staking', 'SnapshotTargetsSizeExceeded', { size: number }>;
 
     /**
      * A new force era mode was set.
      **/
-    ForceEra: GenericPalletEvent<Rv, 'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
+    ForceEra: GenericPalletEvent<'Staking', 'ForceEra', { mode: PalletStakingForcing }>;
 
     /**
      * Report of a controller batch deprecation.
      **/
-    ControllerBatchDeprecated: GenericPalletEvent<Rv, 'Staking', 'ControllerBatchDeprecated', { failures: number }>;
+    ControllerBatchDeprecated: GenericPalletEvent<'Staking', 'ControllerBatchDeprecated', { failures: number }>;
 
     /**
      * Staking balance migrated from locks to holds, with any balance that could not be held
      * is force withdrawn.
      **/
-    CurrencyMigrated: GenericPalletEvent<
-      Rv,
-      'Staking',
-      'CurrencyMigrated',
-      { stash: AccountId32; forceWithdraw: bigint }
-    >;
+    CurrencyMigrated: GenericPalletEvent<'Staking', 'CurrencyMigrated', { stash: AccountId32; forceWithdraw: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Offences`'s events
@@ -521,12 +487,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * (kind-specific) time slot. This event is not deposited for duplicate slashes.
      * \[kind, timeslot\].
      **/
-    Offence: GenericPalletEvent<Rv, 'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
+    Offence: GenericPalletEvent<'Offences', 'Offence', { kind: FixedBytes<16>; timeslot: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Historical`'s events
@@ -535,17 +501,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The merkle root of the validators of the said session were stored
      **/
-    RootStored: GenericPalletEvent<Rv, 'Historical', 'RootStored', { index: number }>;
+    RootStored: GenericPalletEvent<'Historical', 'RootStored', { index: number }>;
 
     /**
      * The merkle roots of up to this session index were pruned
      **/
-    RootsPruned: GenericPalletEvent<Rv, 'Historical', 'RootsPruned', { upTo: number }>;
+    RootsPruned: GenericPalletEvent<'Historical', 'RootsPruned', { upTo: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Parameters`'s events
@@ -557,7 +523,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Is also emitted when the value was not changed.
      **/
     Updated: GenericPalletEvent<
-      Rv,
       'Parameters',
       'Updated',
       {
@@ -581,7 +546,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Session`'s events
@@ -591,28 +556,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New session has happened. Note that the argument is the session index, not the
      * block number as the type might suggest.
      **/
-    NewSession: GenericPalletEvent<Rv, 'Session', 'NewSession', { sessionIndex: number }>;
+    NewSession: GenericPalletEvent<'Session', 'NewSession', { sessionIndex: number }>;
 
     /**
      * The `NewSession` event in the current block also implies a new validator set to be
      * queued.
      **/
-    NewQueued: GenericPalletEvent<Rv, 'Session', 'NewQueued', null>;
+    NewQueued: GenericPalletEvent<'Session', 'NewQueued', null>;
 
     /**
      * Validator has been disabled.
      **/
-    ValidatorDisabled: GenericPalletEvent<Rv, 'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
+    ValidatorDisabled: GenericPalletEvent<'Session', 'ValidatorDisabled', { validator: AccountId32 }>;
 
     /**
      * Validator has been re-enabled.
      **/
-    ValidatorReenabled: GenericPalletEvent<Rv, 'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
+    ValidatorReenabled: GenericPalletEvent<'Session', 'ValidatorReenabled', { validator: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Grandpa`'s events
@@ -622,7 +587,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * New authority set has been applied.
      **/
     NewAuthorities: GenericPalletEvent<
-      Rv,
       'Grandpa',
       'NewAuthorities',
       { authoritySet: Array<[SpConsensusGrandpaAppPublic, bigint]> }
@@ -631,17 +595,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current authority set has been paused.
      **/
-    Paused: GenericPalletEvent<Rv, 'Grandpa', 'Paused', null>;
+    Paused: GenericPalletEvent<'Grandpa', 'Paused', null>;
 
     /**
      * Current authority set has been resumed.
      **/
-    Resumed: GenericPalletEvent<Rv, 'Grandpa', 'Resumed', null>;
+    Resumed: GenericPalletEvent<'Grandpa', 'Resumed', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Utility`'s events
@@ -651,47 +615,47 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Batch of dispatches did not complete fully. Index of first failing dispatch given, as
      * well as the error.
      **/
-    BatchInterrupted: GenericPalletEvent<Rv, 'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
+    BatchInterrupted: GenericPalletEvent<'Utility', 'BatchInterrupted', { index: number; error: DispatchError }>;
 
     /**
      * Batch of dispatches completed fully with no error.
      **/
-    BatchCompleted: GenericPalletEvent<Rv, 'Utility', 'BatchCompleted', null>;
+    BatchCompleted: GenericPalletEvent<'Utility', 'BatchCompleted', null>;
 
     /**
      * Batch of dispatches completed but has errors.
      **/
-    BatchCompletedWithErrors: GenericPalletEvent<Rv, 'Utility', 'BatchCompletedWithErrors', null>;
+    BatchCompletedWithErrors: GenericPalletEvent<'Utility', 'BatchCompletedWithErrors', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with no error.
      **/
-    ItemCompleted: GenericPalletEvent<Rv, 'Utility', 'ItemCompleted', null>;
+    ItemCompleted: GenericPalletEvent<'Utility', 'ItemCompleted', null>;
 
     /**
      * A single item within a Batch of dispatches has completed with error.
      **/
-    ItemFailed: GenericPalletEvent<Rv, 'Utility', 'ItemFailed', { error: DispatchError }>;
+    ItemFailed: GenericPalletEvent<'Utility', 'ItemFailed', { error: DispatchError }>;
 
     /**
      * A call was dispatched.
      **/
-    DispatchedAs: GenericPalletEvent<Rv, 'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
+    DispatchedAs: GenericPalletEvent<'Utility', 'DispatchedAs', { result: Result<[], DispatchError> }>;
 
     /**
      * Main call was dispatched.
      **/
-    IfElseMainSuccess: GenericPalletEvent<Rv, 'Utility', 'IfElseMainSuccess', null>;
+    IfElseMainSuccess: GenericPalletEvent<'Utility', 'IfElseMainSuccess', null>;
 
     /**
      * The fallback call was dispatched.
      **/
-    IfElseFallbackCalled: GenericPalletEvent<Rv, 'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
+    IfElseFallbackCalled: GenericPalletEvent<'Utility', 'IfElseFallbackCalled', { mainError: DispatchError }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Identity`'s events
@@ -700,23 +664,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A name was set or reset (which will remove all judgements).
      **/
-    IdentitySet: GenericPalletEvent<Rv, 'Identity', 'IdentitySet', { who: AccountId32 }>;
+    IdentitySet: GenericPalletEvent<'Identity', 'IdentitySet', { who: AccountId32 }>;
 
     /**
      * A name was cleared, and the given balance returned.
      **/
-    IdentityCleared: GenericPalletEvent<Rv, 'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
+    IdentityCleared: GenericPalletEvent<'Identity', 'IdentityCleared', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A name was removed and the given balance slashed.
      **/
-    IdentityKilled: GenericPalletEvent<Rv, 'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
+    IdentityKilled: GenericPalletEvent<'Identity', 'IdentityKilled', { who: AccountId32; deposit: bigint }>;
 
     /**
      * A judgement was asked from a registrar.
      **/
     JudgementRequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementRequested',
       { who: AccountId32; registrarIndex: number }
@@ -726,7 +689,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A judgement request was retracted.
      **/
     JudgementUnrequested: GenericPalletEvent<
-      Rv,
       'Identity',
       'JudgementUnrequested',
       { who: AccountId32; registrarIndex: number }
@@ -735,23 +697,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A judgement was given by a registrar.
      **/
-    JudgementGiven: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'JudgementGiven',
-      { target: AccountId32; registrarIndex: number }
-    >;
+    JudgementGiven: GenericPalletEvent<'Identity', 'JudgementGiven', { target: AccountId32; registrarIndex: number }>;
 
     /**
      * A registrar was added.
      **/
-    RegistrarAdded: GenericPalletEvent<Rv, 'Identity', 'RegistrarAdded', { registrarIndex: number }>;
+    RegistrarAdded: GenericPalletEvent<'Identity', 'RegistrarAdded', { registrarIndex: number }>;
 
     /**
      * A sub-identity was added to an identity and the deposit paid.
      **/
     SubIdentityAdded: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityAdded',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -761,7 +717,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An account's sub-identities were set (in bulk).
      **/
     SubIdentitiesSet: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentitiesSet',
       { main: AccountId32; numberOfSubs: number; newDeposit: bigint }
@@ -770,18 +725,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A given sub-account's associated name was changed by its super-identity.
      **/
-    SubIdentityRenamed: GenericPalletEvent<
-      Rv,
-      'Identity',
-      'SubIdentityRenamed',
-      { sub: AccountId32; main: AccountId32 }
-    >;
+    SubIdentityRenamed: GenericPalletEvent<'Identity', 'SubIdentityRenamed', { sub: AccountId32; main: AccountId32 }>;
 
     /**
      * A sub-identity was removed from an identity and the deposit freed.
      **/
     SubIdentityRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRemoved',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -792,7 +741,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * main identity account to the sub-identity account.
      **/
     SubIdentityRevoked: GenericPalletEvent<
-      Rv,
       'Identity',
       'SubIdentityRevoked',
       { sub: AccountId32; main: AccountId32; deposit: bigint }
@@ -801,23 +749,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username authority was added.
      **/
-    AuthorityAdded: GenericPalletEvent<Rv, 'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
+    AuthorityAdded: GenericPalletEvent<'Identity', 'AuthorityAdded', { authority: AccountId32 }>;
 
     /**
      * A username authority was removed.
      **/
-    AuthorityRemoved: GenericPalletEvent<Rv, 'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
+    AuthorityRemoved: GenericPalletEvent<'Identity', 'AuthorityRemoved', { authority: AccountId32 }>;
 
     /**
      * A username was set for `who`.
      **/
-    UsernameSet: GenericPalletEvent<Rv, 'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
+    UsernameSet: GenericPalletEvent<'Identity', 'UsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A username was queued, but `who` must accept it prior to `expiration`.
      **/
     UsernameQueued: GenericPalletEvent<
-      Rv,
       'Identity',
       'UsernameQueued',
       { who: AccountId32; username: Bytes; expiration: number }
@@ -826,19 +773,18 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A queued username passed its expiration without being claimed and was removed.
      **/
-    PreapprovalExpired: GenericPalletEvent<Rv, 'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
+    PreapprovalExpired: GenericPalletEvent<'Identity', 'PreapprovalExpired', { whose: AccountId32 }>;
 
     /**
      * A username was set as a primary and can be looked up from `who`.
      **/
-    PrimaryUsernameSet: GenericPalletEvent<Rv, 'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
+    PrimaryUsernameSet: GenericPalletEvent<'Identity', 'PrimaryUsernameSet', { who: AccountId32; username: Bytes }>;
 
     /**
      * A dangling username (as in, a username corresponding to an account that has removed its
      * identity) has been removed.
      **/
     DanglingUsernameRemoved: GenericPalletEvent<
-      Rv,
       'Identity',
       'DanglingUsernameRemoved',
       { who: AccountId32; username: Bytes }
@@ -847,22 +793,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A username has been unbound.
      **/
-    UsernameUnbound: GenericPalletEvent<Rv, 'Identity', 'UsernameUnbound', { username: Bytes }>;
+    UsernameUnbound: GenericPalletEvent<'Identity', 'UsernameUnbound', { username: Bytes }>;
 
     /**
      * A username has been removed.
      **/
-    UsernameRemoved: GenericPalletEvent<Rv, 'Identity', 'UsernameRemoved', { username: Bytes }>;
+    UsernameRemoved: GenericPalletEvent<'Identity', 'UsernameRemoved', { username: Bytes }>;
 
     /**
      * A username has been killed.
      **/
-    UsernameKilled: GenericPalletEvent<Rv, 'Identity', 'UsernameKilled', { username: Bytes }>;
+    UsernameKilled: GenericPalletEvent<'Identity', 'UsernameKilled', { username: Bytes }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Recovery`'s events
@@ -871,13 +817,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been set up for an account.
      **/
-    RecoveryCreated: GenericPalletEvent<Rv, 'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
+    RecoveryCreated: GenericPalletEvent<'Recovery', 'RecoveryCreated', { account: AccountId32 }>;
 
     /**
      * A recovery process has been initiated for lost account by rescuer account.
      **/
     RecoveryInitiated: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryInitiated',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -887,7 +832,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been vouched for by sender.
      **/
     RecoveryVouched: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryVouched',
       { lostAccount: AccountId32; rescuerAccount: AccountId32; sender: AccountId32 }
@@ -897,7 +841,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A recovery process for lost account by rescuer account has been closed.
      **/
     RecoveryClosed: GenericPalletEvent<
-      Rv,
       'Recovery',
       'RecoveryClosed',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -907,7 +850,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Lost account has been successfully recovered by rescuer account.
      **/
     AccountRecovered: GenericPalletEvent<
-      Rv,
       'Recovery',
       'AccountRecovered',
       { lostAccount: AccountId32; rescuerAccount: AccountId32 }
@@ -916,13 +858,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A recovery process has been removed for an account.
      **/
-    RecoveryRemoved: GenericPalletEvent<Rv, 'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
+    RecoveryRemoved: GenericPalletEvent<'Recovery', 'RecoveryRemoved', { lostAccount: AccountId32 }>;
 
     /**
      * A deposit has been updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Recovery',
       'DepositPoked',
       { who: AccountId32; kind: PalletRecoveryDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -931,7 +872,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Vesting`'s events
@@ -940,28 +881,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A vesting schedule has been created.
      **/
-    VestingCreated: GenericPalletEvent<
-      Rv,
-      'Vesting',
-      'VestingCreated',
-      { account: AccountId32; scheduleIndex: number }
-    >;
+    VestingCreated: GenericPalletEvent<'Vesting', 'VestingCreated', { account: AccountId32; scheduleIndex: number }>;
 
     /**
      * The amount vested has been updated. This could indicate a change in funds available.
      * The balance given is the amount which is left unvested (and thus locked).
      **/
-    VestingUpdated: GenericPalletEvent<Rv, 'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
+    VestingUpdated: GenericPalletEvent<'Vesting', 'VestingUpdated', { account: AccountId32; unvested: bigint }>;
 
     /**
      * An \[account\] has become fully vested.
      **/
-    VestingCompleted: GenericPalletEvent<Rv, 'Vesting', 'VestingCompleted', { account: AccountId32 }>;
+    VestingCompleted: GenericPalletEvent<'Vesting', 'VestingCompleted', { account: AccountId32 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Scheduler`'s events
@@ -970,18 +906,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Scheduled some task.
      **/
-    Scheduled: GenericPalletEvent<Rv, 'Scheduler', 'Scheduled', { when: number; index: number }>;
+    Scheduled: GenericPalletEvent<'Scheduler', 'Scheduled', { when: number; index: number }>;
 
     /**
      * Canceled some task.
      **/
-    Canceled: GenericPalletEvent<Rv, 'Scheduler', 'Canceled', { when: number; index: number }>;
+    Canceled: GenericPalletEvent<'Scheduler', 'Canceled', { when: number; index: number }>;
 
     /**
      * Dispatched some task.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'Dispatched',
       { task: [number, number]; id?: FixedBytes<32> | undefined; result: Result<[], DispatchError> }
@@ -991,7 +926,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Set a retry configuration for some task.
      **/
     RetrySet: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetrySet',
       { task: [number, number]; id?: FixedBytes<32> | undefined; period: number; retries: number }
@@ -1001,7 +935,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Cancel a retry configuration for some task.
      **/
     RetryCancelled: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryCancelled',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1011,7 +944,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The call for the provided hash was not found so the task has been aborted.
      **/
     CallUnavailable: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'CallUnavailable',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1021,7 +953,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task was unable to be renewed since the agenda is full at that block.
      **/
     PeriodicFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PeriodicFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1032,7 +963,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * was not enough weight to reschedule it.
      **/
     RetryFailed: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'RetryFailed',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1042,7 +972,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The given task can never be executed since it is overweight.
      **/
     PermanentlyOverweight: GenericPalletEvent<
-      Rv,
       'Scheduler',
       'PermanentlyOverweight',
       { task: [number, number]; id?: FixedBytes<32> | undefined }
@@ -1051,12 +980,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Agenda is incomplete from `when`.
      **/
-    AgendaIncomplete: GenericPalletEvent<Rv, 'Scheduler', 'AgendaIncomplete', { when: number }>;
+    AgendaIncomplete: GenericPalletEvent<'Scheduler', 'AgendaIncomplete', { when: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Preimage`'s events
@@ -1065,22 +994,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A preimage has been noted.
      **/
-    Noted: GenericPalletEvent<Rv, 'Preimage', 'Noted', { hash: H256 }>;
+    Noted: GenericPalletEvent<'Preimage', 'Noted', { hash: H256 }>;
 
     /**
      * A preimage has been requested.
      **/
-    Requested: GenericPalletEvent<Rv, 'Preimage', 'Requested', { hash: H256 }>;
+    Requested: GenericPalletEvent<'Preimage', 'Requested', { hash: H256 }>;
 
     /**
      * A preimage has ben cleared.
      **/
-    Cleared: GenericPalletEvent<Rv, 'Preimage', 'Cleared', { hash: H256 }>;
+    Cleared: GenericPalletEvent<'Preimage', 'Cleared', { hash: H256 }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Sudo`'s events
@@ -1090,7 +1019,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A sudo call just took place.
      **/
     Sudid: GenericPalletEvent<
-      Rv,
       'Sudo',
       'Sudid',
       {
@@ -1105,7 +1033,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The sudo key has been updated.
      **/
     KeyChanged: GenericPalletEvent<
-      Rv,
       'Sudo',
       'KeyChanged',
       {
@@ -1124,13 +1051,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The key was permanently removed.
      **/
-    KeyRemoved: GenericPalletEvent<Rv, 'Sudo', 'KeyRemoved', null>;
+    KeyRemoved: GenericPalletEvent<'Sudo', 'KeyRemoved', null>;
 
     /**
      * A [sudo_as](Pallet::sudo_as) call just took place.
      **/
     SudoAsDone: GenericPalletEvent<
-      Rv,
       'Sudo',
       'SudoAsDone',
       {
@@ -1144,7 +1070,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Proxy`'s events
@@ -1153,14 +1079,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A proxy was executed correctly, with the given.
      **/
-    ProxyExecuted: GenericPalletEvent<Rv, 'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
+    ProxyExecuted: GenericPalletEvent<'Proxy', 'ProxyExecuted', { result: Result<[], DispatchError> }>;
 
     /**
      * A pure account has been created by new proxy with given
      * disambiguation index and proxy type.
      **/
     PureCreated: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureCreated',
       {
@@ -1177,7 +1102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pure proxy was killed by its spawner.
      **/
     PureKilled: GenericPalletEvent<
-      Rv,
       'Proxy',
       'PureKilled',
       { pure: AccountId32; spawner: AccountId32; proxyType: WestendRuntimeProxyType; disambiguationIndex: number }
@@ -1186,13 +1110,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An announcement was placed to make a call in the future.
      **/
-    Announced: GenericPalletEvent<Rv, 'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
+    Announced: GenericPalletEvent<'Proxy', 'Announced', { real: AccountId32; proxy: AccountId32; callHash: H256 }>;
 
     /**
      * A proxy was added.
      **/
     ProxyAdded: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyAdded',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: WestendRuntimeProxyType; delay: number }
@@ -1202,7 +1125,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proxy was removed.
      **/
     ProxyRemoved: GenericPalletEvent<
-      Rv,
       'Proxy',
       'ProxyRemoved',
       { delegator: AccountId32; delegatee: AccountId32; proxyType: WestendRuntimeProxyType; delay: number }
@@ -1212,7 +1134,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit stored for proxies or announcements was poked / updated.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Proxy',
       'DepositPoked',
       { who: AccountId32; kind: PalletProxyDepositKind; oldDeposit: bigint; newDeposit: bigint }
@@ -1221,7 +1142,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Multisig`'s events
@@ -1231,7 +1152,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new multisig operation has begun.
      **/
     NewMultisig: GenericPalletEvent<
-      Rv,
       'Multisig',
       'NewMultisig',
       { approving: AccountId32; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1241,7 +1161,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been approved by someone.
      **/
     MultisigApproval: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigApproval',
       { approving: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1251,7 +1170,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been executed.
      **/
     MultisigExecuted: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigExecuted',
       {
@@ -1267,7 +1185,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A multisig operation has been cancelled.
      **/
     MultisigCancelled: GenericPalletEvent<
-      Rv,
       'Multisig',
       'MultisigCancelled',
       { cancelling: AccountId32; timepoint: PalletMultisigTimepoint; multisig: AccountId32; callHash: FixedBytes<32> }
@@ -1277,7 +1194,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The deposit for a multisig operation has been updated/poked.
      **/
     DepositPoked: GenericPalletEvent<
-      Rv,
       'Multisig',
       'DepositPoked',
       { who: AccountId32; callHash: FixedBytes<32>; oldDeposit: bigint; newDeposit: bigint }
@@ -1286,7 +1202,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s events
@@ -1302,7 +1218,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * room for this one.
      **/
     SolutionStored: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'SolutionStored',
       {
@@ -1316,7 +1231,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The election has been finalized, with the given computation and score.
      **/
     ElectionFinalized: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'ElectionFinalized',
       { compute: PalletElectionProviderMultiPhaseElectionCompute; score: SpNposElectionsElectionScore }
@@ -1327,23 +1241,22 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * Not much can be said about which computes failed in the process.
      **/
-    ElectionFailed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'ElectionFailed', null>;
+    ElectionFailed: GenericPalletEvent<'ElectionProviderMultiPhase', 'ElectionFailed', null>;
 
     /**
      * An account has been rewarded for their signed submission being finalized.
      **/
-    Rewarded: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
+    Rewarded: GenericPalletEvent<'ElectionProviderMultiPhase', 'Rewarded', { account: AccountId32; value: bigint }>;
 
     /**
      * An account has been slashed for submitting an invalid signed submission.
      **/
-    Slashed: GenericPalletEvent<Rv, 'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
+    Slashed: GenericPalletEvent<'ElectionProviderMultiPhase', 'Slashed', { account: AccountId32; value: bigint }>;
 
     /**
      * There was a phase transition in a given round.
      **/
     PhaseTransitioned: GenericPalletEvent<
-      Rv,
       'ElectionProviderMultiPhase',
       'PhaseTransitioned',
       { from: PalletElectionProviderMultiPhasePhase; to: PalletElectionProviderMultiPhasePhase; round: number }
@@ -1352,7 +1265,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `VoterList`'s events
@@ -1361,17 +1274,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Moved an account from one bag to another.
      **/
-    Rebagged: GenericPalletEvent<Rv, 'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
+    Rebagged: GenericPalletEvent<'VoterList', 'Rebagged', { who: AccountId32; from: bigint; to: bigint }>;
 
     /**
      * Updated the score of some account to the given amount.
      **/
-    ScoreUpdated: GenericPalletEvent<Rv, 'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
+    ScoreUpdated: GenericPalletEvent<'VoterList', 'ScoreUpdated', { who: AccountId32; newScore: bigint }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `NominationPools`'s events
@@ -1380,13 +1293,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been created.
      **/
-    Created: GenericPalletEvent<Rv, 'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
+    Created: GenericPalletEvent<'NominationPools', 'Created', { depositor: AccountId32; poolId: number }>;
 
     /**
      * A member has became bonded in a pool.
      **/
     Bonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Bonded',
       { member: AccountId32; poolId: number; bonded: bigint; joined: boolean }
@@ -1395,12 +1307,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A payout has been made to a member.
      **/
-    PaidOut: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'PaidOut',
-      { member: AccountId32; poolId: number; payout: bigint }
-    >;
+    PaidOut: GenericPalletEvent<'NominationPools', 'PaidOut', { member: AccountId32; poolId: number; payout: bigint }>;
 
     /**
      * A member has unbonded from their pool.
@@ -1416,7 +1323,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * requested to be unbonded.
      **/
     Unbonded: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Unbonded',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint; era: number }
@@ -1431,7 +1337,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * will be 1.
      **/
     Withdrawn: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'Withdrawn',
       { member: AccountId32; poolId: number; balance: bigint; points: bigint }
@@ -1440,13 +1345,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool has been destroyed.
      **/
-    Destroyed: GenericPalletEvent<Rv, 'NominationPools', 'Destroyed', { poolId: number }>;
+    Destroyed: GenericPalletEvent<'NominationPools', 'Destroyed', { poolId: number }>;
 
     /**
      * The state of a pool has changed
      **/
     StateChanged: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'StateChanged',
       { poolId: number; newState: PalletNominationPoolsPoolState }
@@ -1460,7 +1364,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * represented by `released_balance`.
      **/
     MemberRemoved: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberRemoved',
       { poolId: number; member: AccountId32; releasedBalance: bigint }
@@ -1471,7 +1374,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * can never change.
      **/
     RolesUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'RolesUpdated',
       { root?: AccountId32 | undefined; bouncer?: AccountId32 | undefined; nominator?: AccountId32 | undefined }
@@ -1480,13 +1382,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The active balance of pool `pool_id` has been slashed to `balance`.
      **/
-    PoolSlashed: GenericPalletEvent<Rv, 'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
+    PoolSlashed: GenericPalletEvent<'NominationPools', 'PoolSlashed', { poolId: number; balance: bigint }>;
 
     /**
      * The unbond pool at `era` of pool `pool_id` has been slashed to `balance`.
      **/
     UnbondingPoolSlashed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'UnbondingPoolSlashed',
       { poolId: number; era: number; balance: bigint }
@@ -1496,7 +1397,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission setting has been changed.
      **/
     PoolCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionUpdated',
       { poolId: number; current?: [Perbill, AccountId32] | undefined }
@@ -1506,7 +1406,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's maximum commission setting has been changed.
      **/
     PoolMaxCommissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolMaxCommissionUpdated',
       { poolId: number; maxCommission: Perbill }
@@ -1516,7 +1415,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool's commission `change_rate` has been changed.
      **/
     PoolCommissionChangeRateUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionChangeRateUpdated',
       { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate }
@@ -1526,7 +1424,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission claim permission has been updated.
      **/
     PoolCommissionClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimPermissionUpdated',
       { poolId: number; permission?: PalletNominationPoolsCommissionClaimPermission | undefined }
@@ -1536,7 +1433,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Pool commission has been claimed.
      **/
     PoolCommissionClaimed: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolCommissionClaimed',
       { poolId: number; commission: bigint }
@@ -1546,7 +1442,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Topped up deficit in frozen ED of the reward pool.
      **/
     MinBalanceDeficitAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceDeficitAdjusted',
       { poolId: number; amount: bigint }
@@ -1556,7 +1451,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Claimed excess frozen ED of af the reward pool.
      **/
     MinBalanceExcessAdjusted: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MinBalanceExcessAdjusted',
       { poolId: number; amount: bigint }
@@ -1566,7 +1460,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A pool member's claim permission has been updated.
      **/
     MemberClaimPermissionUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'MemberClaimPermissionUpdated',
       { member: AccountId32; permission: PalletNominationPoolsClaimPermission }
@@ -1575,19 +1468,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A pool's metadata was updated.
      **/
-    MetadataUpdated: GenericPalletEvent<
-      Rv,
-      'NominationPools',
-      'MetadataUpdated',
-      { poolId: number; caller: AccountId32 }
-    >;
+    MetadataUpdated: GenericPalletEvent<'NominationPools', 'MetadataUpdated', { poolId: number; caller: AccountId32 }>;
 
     /**
      * A pool's nominating account (or the pool's root account) has nominated a validator set
      * on behalf of the pool.
      **/
     PoolNominationMade: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominationMade',
       { poolId: number; caller: AccountId32 }
@@ -1597,7 +1484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The pool is chilled i.e. no longer nominating.
      **/
     PoolNominatorChilled: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'PoolNominatorChilled',
       { poolId: number; caller: AccountId32 }
@@ -1607,7 +1493,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Global parameters regulating nomination pools have been updated.
      **/
     GlobalParamsUpdated: GenericPalletEvent<
-      Rv,
       'NominationPools',
       'GlobalParamsUpdated',
       {
@@ -1623,7 +1508,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `FastUnstake`'s events
@@ -1632,22 +1517,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A staker was unstaked.
      **/
-    Unstaked: GenericPalletEvent<
-      Rv,
-      'FastUnstake',
-      'Unstaked',
-      { stash: AccountId32; result: Result<[], DispatchError> }
-    >;
+    Unstaked: GenericPalletEvent<'FastUnstake', 'Unstaked', { stash: AccountId32; result: Result<[], DispatchError> }>;
 
     /**
      * A staker was slashed for requesting fast-unstake whilst being exposed.
      **/
-    Slashed: GenericPalletEvent<Rv, 'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
+    Slashed: GenericPalletEvent<'FastUnstake', 'Slashed', { stash: AccountId32; amount: bigint }>;
 
     /**
      * A batch was partially checked for the given eras, but the process did not finish.
      **/
-    BatchChecked: GenericPalletEvent<Rv, 'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
+    BatchChecked: GenericPalletEvent<'FastUnstake', 'BatchChecked', { eras: Array<number> }>;
 
     /**
      * A batch of a given size was terminated.
@@ -1655,17 +1535,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This is always follows by a number of `Unstaked` or `Slashed` events, marking the end
      * of the batch. A new batch will be created upon next block.
      **/
-    BatchFinished: GenericPalletEvent<Rv, 'FastUnstake', 'BatchFinished', { size: number }>;
+    BatchFinished: GenericPalletEvent<'FastUnstake', 'BatchFinished', { size: number }>;
 
     /**
      * An internal error happened. Operations will be paused now.
      **/
-    InternalError: GenericPalletEvent<Rv, 'FastUnstake', 'InternalError', null>;
+    InternalError: GenericPalletEvent<'FastUnstake', 'InternalError', null>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ConvictionVoting`'s events
@@ -1674,18 +1554,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An account has delegated their vote to another account. \[who, target\]
      **/
-    Delegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Delegated', [AccountId32, AccountId32, number]>;
+    Delegated: GenericPalletEvent<'ConvictionVoting', 'Delegated', [AccountId32, AccountId32, number]>;
 
     /**
      * An \[account\] has cancelled a previous delegation operation.
      **/
-    Undelegated: GenericPalletEvent<Rv, 'ConvictionVoting', 'Undelegated', [AccountId32, number]>;
+    Undelegated: GenericPalletEvent<'ConvictionVoting', 'Undelegated', [AccountId32, number]>;
 
     /**
      * An account has voted
      **/
     Voted: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'Voted',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote; pollIndex: number }
@@ -1695,7 +1574,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A vote has been removed
      **/
     VoteRemoved: GenericPalletEvent<
-      Rv,
       'ConvictionVoting',
       'VoteRemoved',
       { who: AccountId32; vote: PalletConvictionVotingVoteAccountVote; pollIndex: number }
@@ -1704,12 +1582,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The lockup period of a conviction vote expired, and the funds have been unlocked.
      **/
-    VoteUnlocked: GenericPalletEvent<Rv, 'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
+    VoteUnlocked: GenericPalletEvent<'ConvictionVoting', 'VoteUnlocked', { who: AccountId32; class: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Referenda`'s events
@@ -1719,7 +1597,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been submitted.
      **/
     Submitted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Submitted',
       {
@@ -1744,7 +1621,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been placed.
      **/
     DecisionDepositPlaced: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositPlaced',
       {
@@ -1769,7 +1645,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The decision deposit has been refunded.
      **/
     DecisionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionDepositRefunded',
       {
@@ -1794,7 +1669,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A deposit has been slashed.
      **/
     DepositSlashed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DepositSlashed',
       {
@@ -1814,7 +1688,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has moved into the deciding phase.
      **/
     DecisionStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'DecisionStarted',
       {
@@ -1840,7 +1713,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmStarted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmStarted',
       {
@@ -1851,7 +1723,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
       }
     >;
     ConfirmAborted: GenericPalletEvent<
-      Rv,
       'Referenda',
       'ConfirmAborted',
       {
@@ -1866,7 +1737,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has ended its confirmation phase and is ready for approval.
      **/
     Confirmed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Confirmed',
       {
@@ -1886,7 +1756,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been approved and its proposal has been scheduled.
      **/
     Approved: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Approved',
       {
@@ -1901,7 +1770,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A proposal has been rejected by referendum.
      **/
     Rejected: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Rejected',
       {
@@ -1921,7 +1789,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been timed out without being decided.
      **/
     TimedOut: GenericPalletEvent<
-      Rv,
       'Referenda',
       'TimedOut',
       {
@@ -1941,7 +1808,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been cancelled.
      **/
     Cancelled: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Cancelled',
       {
@@ -1961,7 +1827,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A referendum has been killed.
      **/
     Killed: GenericPalletEvent<
-      Rv,
       'Referenda',
       'Killed',
       {
@@ -1981,7 +1846,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The submission deposit has been refunded.
      **/
     SubmissionDepositRefunded: GenericPalletEvent<
-      Rv,
       'Referenda',
       'SubmissionDepositRefunded',
       {
@@ -2006,7 +1870,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been set.
      **/
     MetadataSet: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataSet',
       {
@@ -2026,7 +1889,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Metadata for a referendum has been cleared.
      **/
     MetadataCleared: GenericPalletEvent<
-      Rv,
       'Referenda',
       'MetadataCleared',
       {
@@ -2045,16 +1907,15 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Whitelist`'s events
    **/
   whitelist: {
-    CallWhitelisted: GenericPalletEvent<Rv, 'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
-    WhitelistedCallRemoved: GenericPalletEvent<Rv, 'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
+    CallWhitelisted: GenericPalletEvent<'Whitelist', 'CallWhitelisted', { callHash: H256 }>;
+    WhitelistedCallRemoved: GenericPalletEvent<'Whitelist', 'WhitelistedCallRemoved', { callHash: H256 }>;
     WhitelistedCallDispatched: GenericPalletEvent<
-      Rv,
       'Whitelist',
       'WhitelistedCallDispatched',
       { callHash: H256; result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -2063,7 +1924,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Treasury`'s events
@@ -2072,38 +1933,32 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * We have ended a spend period and will now allocate funds.
      **/
-    Spending: GenericPalletEvent<Rv, 'Treasury', 'Spending', { budgetRemaining: bigint }>;
+    Spending: GenericPalletEvent<'Treasury', 'Spending', { budgetRemaining: bigint }>;
 
     /**
      * Some funds have been allocated.
      **/
-    Awarded: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'Awarded',
-      { proposalIndex: number; award: bigint; account: AccountId32 }
-    >;
+    Awarded: GenericPalletEvent<'Treasury', 'Awarded', { proposalIndex: number; award: bigint; account: AccountId32 }>;
 
     /**
      * Some of our funds have been burnt.
      **/
-    Burnt: GenericPalletEvent<Rv, 'Treasury', 'Burnt', { burntFunds: bigint }>;
+    Burnt: GenericPalletEvent<'Treasury', 'Burnt', { burntFunds: bigint }>;
 
     /**
      * Spending has finished; this is the amount that rolls over until next spend.
      **/
-    Rollover: GenericPalletEvent<Rv, 'Treasury', 'Rollover', { rolloverBalance: bigint }>;
+    Rollover: GenericPalletEvent<'Treasury', 'Rollover', { rolloverBalance: bigint }>;
 
     /**
      * Some funds have been deposited.
      **/
-    Deposit: GenericPalletEvent<Rv, 'Treasury', 'Deposit', { value: bigint }>;
+    Deposit: GenericPalletEvent<'Treasury', 'Deposit', { value: bigint }>;
 
     /**
      * A new spend proposal has been approved.
      **/
     SpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'SpendApproved',
       { proposalIndex: number; amount: bigint; beneficiary: AccountId32 }
@@ -2112,18 +1967,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The inactive funds of the pallet have been updated.
      **/
-    UpdatedInactive: GenericPalletEvent<
-      Rv,
-      'Treasury',
-      'UpdatedInactive',
-      { reactivated: bigint; deactivated: bigint }
-    >;
+    UpdatedInactive: GenericPalletEvent<'Treasury', 'UpdatedInactive', { reactivated: bigint; deactivated: bigint }>;
 
     /**
      * A new asset spend proposal has been approved.
      **/
     AssetSpendApproved: GenericPalletEvent<
-      Rv,
       'Treasury',
       'AssetSpendApproved',
       {
@@ -2139,28 +1988,28 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An approved spend was voided.
      **/
-    AssetSpendVoided: GenericPalletEvent<Rv, 'Treasury', 'AssetSpendVoided', { index: number }>;
+    AssetSpendVoided: GenericPalletEvent<'Treasury', 'AssetSpendVoided', { index: number }>;
 
     /**
      * A payment happened.
      **/
-    Paid: GenericPalletEvent<Rv, 'Treasury', 'Paid', { index: number; paymentId: bigint }>;
+    Paid: GenericPalletEvent<'Treasury', 'Paid', { index: number; paymentId: bigint }>;
 
     /**
      * A payment failed and can be retried.
      **/
-    PaymentFailed: GenericPalletEvent<Rv, 'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
+    PaymentFailed: GenericPalletEvent<'Treasury', 'PaymentFailed', { index: number; paymentId: bigint }>;
 
     /**
      * A spend was processed and removed from the storage. It might have been successfully
      * paid or it may have expired.
      **/
-    SpendProcessed: GenericPalletEvent<Rv, 'Treasury', 'SpendProcessed', { index: number }>;
+    SpendProcessed: GenericPalletEvent<'Treasury', 'SpendProcessed', { index: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `DelegatedStaking`'s events
@@ -2170,7 +2019,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds delegated by a delegator.
      **/
     Delegated: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Delegated',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2180,7 +2028,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds released to a delegator.
      **/
     Released: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Released',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2190,7 +2037,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Funds slashed from a delegator.
      **/
     Slashed: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'Slashed',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2200,7 +2046,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Unclaimed delegation funds migrated to delegator.
      **/
     MigratedDelegation: GenericPalletEvent<
-      Rv,
       'DelegatedStaking',
       'MigratedDelegation',
       { agent: AccountId32; delegator: AccountId32; amount: bigint }
@@ -2209,7 +2054,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParaInclusion`'s events
@@ -2219,7 +2064,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was backed. `[candidate, head_data]`
      **/
     CandidateBacked: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateBacked',
       [
@@ -2234,7 +2078,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate was included. `[candidate, head_data]`
      **/
     CandidateIncluded: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateIncluded',
       [
@@ -2249,7 +2092,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A candidate timed out. `[candidate, head_data]`
      **/
     CandidateTimedOut: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'CandidateTimedOut',
       [
@@ -2263,7 +2105,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some upward messages have been received and will be processed.
      **/
     UpwardMessagesReceived: GenericPalletEvent<
-      Rv,
       'ParaInclusion',
       'UpwardMessagesReceived',
       { from: PolkadotParachainPrimitivesPrimitivesId; count: number }
@@ -2272,7 +2113,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Paras`'s events
@@ -2281,39 +2122,33 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Current code has been updated for a Para. `para_id`
      **/
-    CurrentCodeUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentCodeUpdated: GenericPalletEvent<'Paras', 'CurrentCodeUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Current head has been updated for a Para. `para_id`
      **/
-    CurrentHeadUpdated: GenericPalletEvent<Rv, 'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
+    CurrentHeadUpdated: GenericPalletEvent<'Paras', 'CurrentHeadUpdated', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A code upgrade has been scheduled for a Para. `para_id`
      **/
-    CodeUpgradeScheduled: GenericPalletEvent<
-      Rv,
-      'Paras',
-      'CodeUpgradeScheduled',
-      PolkadotParachainPrimitivesPrimitivesId
-    >;
+    CodeUpgradeScheduled: GenericPalletEvent<'Paras', 'CodeUpgradeScheduled', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A new head has been noted for a Para. `para_id`
      **/
-    NewHeadNoted: GenericPalletEvent<Rv, 'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
+    NewHeadNoted: GenericPalletEvent<'Paras', 'NewHeadNoted', PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * A para has been queued to execute pending actions. `para_id`
      **/
-    ActionQueued: GenericPalletEvent<Rv, 'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
+    ActionQueued: GenericPalletEvent<'Paras', 'ActionQueued', [PolkadotParachainPrimitivesPrimitivesId, number]>;
 
     /**
      * The given para either initiated or subscribed to a PVF check for the given validation
      * code. `code_hash` `para_id`
      **/
     PvfCheckStarted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckStarted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2324,7 +2159,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckAccepted: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckAccepted',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2335,7 +2169,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `code_hash` `para_id`
      **/
     PvfCheckRejected: GenericPalletEvent<
-      Rv,
       'Paras',
       'PvfCheckRejected',
       [PolkadotParachainPrimitivesPrimitivesValidationCodeHash, PolkadotParachainPrimitivesPrimitivesId]
@@ -2345,7 +2178,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The upgrade cooldown was removed.
      **/
     UpgradeCooldownRemoved: GenericPalletEvent<
-      Rv,
       'Paras',
       'UpgradeCooldownRemoved',
       {
@@ -2360,7 +2192,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new code hash has been authorized for a Para.
      **/
     CodeAuthorized: GenericPalletEvent<
-      Rv,
       'Paras',
       'CodeAuthorized',
       {
@@ -2384,7 +2215,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Hrmp`'s events
@@ -2394,7 +2225,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel requested.
      **/
     OpenChannelRequested: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelRequested',
       {
@@ -2409,7 +2239,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel request sent by the receiver was canceled by either party.
      **/
     OpenChannelCanceled: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelCanceled',
       {
@@ -2422,7 +2251,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Open HRMP channel accepted.
      **/
     OpenChannelAccepted: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelAccepted',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2432,7 +2260,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * HRMP channel closed.
      **/
     ChannelClosed: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'ChannelClosed',
       {
@@ -2445,7 +2272,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened via Root origin.
      **/
     HrmpChannelForceOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpChannelForceOpened',
       {
@@ -2460,7 +2286,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel was opened with a system chain.
      **/
     HrmpSystemChannelOpened: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'HrmpSystemChannelOpened',
       {
@@ -2475,7 +2300,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An HRMP channel's deposits were updated.
      **/
     OpenChannelDepositsUpdated: GenericPalletEvent<
-      Rv,
       'Hrmp',
       'OpenChannelDepositsUpdated',
       { sender: PolkadotParachainPrimitivesPrimitivesId; recipient: PolkadotParachainPrimitivesPrimitivesId }
@@ -2484,7 +2308,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `ParasDisputes`'s events
@@ -2494,7 +2318,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A dispute has been initiated. \[candidate hash, dispute location\]
      **/
     DisputeInitiated: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeInitiated',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeLocation]
@@ -2505,7 +2328,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `\[para id, candidate hash, dispute result\]`
      **/
     DisputeConcluded: GenericPalletEvent<
-      Rv,
       'ParasDisputes',
       'DisputeConcluded',
       [PolkadotCorePrimitivesCandidateHash, PolkadotRuntimeParachainsDisputesDisputeResult]
@@ -2517,12 +2339,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * instead revert the block at the given height. This should be the
      * number of the child of the last known valid block in the chain.
      **/
-    Revert: GenericPalletEvent<Rv, 'ParasDisputes', 'Revert', number>;
+    Revert: GenericPalletEvent<'ParasDisputes', 'Revert', number>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s events
@@ -2532,7 +2354,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An order was placed at some spot price amount by orderer ordered_by
      **/
     OnDemandOrderPlaced: GenericPalletEvent<
-      Rv,
       'OnDemandAssignmentProvider',
       'OnDemandOrderPlaced',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; spotPrice: bigint; orderedBy: AccountId32 }
@@ -2541,13 +2362,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The value of the spot price has likely changed
      **/
-    SpotPriceSet: GenericPalletEvent<Rv, 'OnDemandAssignmentProvider', 'SpotPriceSet', { spotPrice: bigint }>;
+    SpotPriceSet: GenericPalletEvent<'OnDemandAssignmentProvider', 'SpotPriceSet', { spotPrice: bigint }>;
 
     /**
      * An account was given credits.
      **/
     AccountCredited: GenericPalletEvent<
-      Rv,
       'OnDemandAssignmentProvider',
       'AccountCredited',
       { who: AccountId32; amount: bigint }
@@ -2556,32 +2376,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Registrar`'s events
    **/
   registrar: {
     Registered: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Registered',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; manager: AccountId32 }
     >;
-    Deregistered: GenericPalletEvent<
-      Rv,
-      'Registrar',
-      'Deregistered',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    Deregistered: GenericPalletEvent<'Registrar', 'Deregistered', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
     Reserved: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Reserved',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; who: AccountId32 }
     >;
     Swapped: GenericPalletEvent<
-      Rv,
       'Registrar',
       'Swapped',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; otherId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2590,7 +2402,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Slots`'s events
@@ -2599,7 +2411,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A new `[lease_period]` is beginning.
      **/
-    NewLeasePeriod: GenericPalletEvent<Rv, 'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
+    NewLeasePeriod: GenericPalletEvent<'Slots', 'NewLeasePeriod', { leasePeriod: number }>;
 
     /**
      * A para has won the right to a continuous set of lease periods as a parachain.
@@ -2607,7 +2419,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Second balance is the total amount reserved.
      **/
     Leased: GenericPalletEvent<
-      Rv,
       'Slots',
       'Leased',
       {
@@ -2623,7 +2434,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Auctions`'s events
@@ -2634,7 +2445,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * close and the first lease period of the quadruplet that is auctioned.
      **/
     AuctionStarted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'AuctionStarted',
       { auctionIndex: number; leasePeriod: number; ending: number }
@@ -2643,14 +2453,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An auction ended. All funds become unreserved.
      **/
-    AuctionClosed: GenericPalletEvent<Rv, 'Auctions', 'AuctionClosed', { auctionIndex: number }>;
+    AuctionClosed: GenericPalletEvent<'Auctions', 'AuctionClosed', { auctionIndex: number }>;
 
     /**
      * Funds were reserved for a winning bid. First balance is the extra amount reserved.
      * Second is the total.
      **/
     Reserved: GenericPalletEvent<
-      Rv,
       'Auctions',
       'Reserved',
       { bidder: AccountId32; extraReserved: bigint; totalAmount: bigint }
@@ -2659,14 +2468,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Funds were unreserved since bidder is no longer active. `[bidder, amount]`
      **/
-    Unreserved: GenericPalletEvent<Rv, 'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
+    Unreserved: GenericPalletEvent<'Auctions', 'Unreserved', { bidder: AccountId32; amount: bigint }>;
 
     /**
      * Someone attempted to lease the same slot twice for a parachain. The amount is held in
      * reserve but no parachain slot has been leased.
      **/
     ReserveConfiscated: GenericPalletEvent<
-      Rv,
       'Auctions',
       'ReserveConfiscated',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; leaser: AccountId32; amount: bigint }
@@ -2676,7 +2484,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new bid has been accepted as the current winner.
      **/
     BidAccepted: GenericPalletEvent<
-      Rv,
       'Auctions',
       'BidAccepted',
       {
@@ -2692,12 +2499,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The winning offset was chosen for an auction. This will map into the `Winning` storage
      * map.
      **/
-    WinningOffset: GenericPalletEvent<Rv, 'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
+    WinningOffset: GenericPalletEvent<'Auctions', 'WinningOffset', { auctionIndex: number; blockNumber: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Crowdloan`'s events
@@ -2706,13 +2513,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Create a new crowdloaning campaign.
      **/
-    Created: GenericPalletEvent<Rv, 'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Created: GenericPalletEvent<'Crowdloan', 'Created', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Contributed to a crowd sale.
      **/
     Contributed: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Contributed',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2722,7 +2528,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Withdrew full balance of a contributor.
      **/
     Withdrew: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'Withdrew',
       { who: AccountId32; fundIndex: PolkadotParachainPrimitivesPrimitivesId; amount: bigint }
@@ -2733,7 +2538,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * over child keys that still need to be killed.
      **/
     PartiallyRefunded: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'PartiallyRefunded',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2742,23 +2546,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * All loans in a fund have been refunded.
      **/
-    AllRefunded: GenericPalletEvent<
-      Rv,
-      'Crowdloan',
-      'AllRefunded',
-      { paraId: PolkadotParachainPrimitivesPrimitivesId }
-    >;
+    AllRefunded: GenericPalletEvent<'Crowdloan', 'AllRefunded', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * Fund is dissolved.
      **/
-    Dissolved: GenericPalletEvent<Rv, 'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Dissolved: GenericPalletEvent<'Crowdloan', 'Dissolved', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * The result of trying to submit a new bid to the Slots pallet.
      **/
     HandleBidResult: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'HandleBidResult',
       { paraId: PolkadotParachainPrimitivesPrimitivesId; result: Result<[], DispatchError> }
@@ -2767,13 +2565,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The configuration to a crowdloan has been edited.
      **/
-    Edited: GenericPalletEvent<Rv, 'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
+    Edited: GenericPalletEvent<'Crowdloan', 'Edited', { paraId: PolkadotParachainPrimitivesPrimitivesId }>;
 
     /**
      * A memo has been updated.
      **/
     MemoUpdated: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'MemoUpdated',
       { who: AccountId32; paraId: PolkadotParachainPrimitivesPrimitivesId; memo: Bytes }
@@ -2783,7 +2580,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain has been moved to `NewRaise`
      **/
     AddedToNewRaise: GenericPalletEvent<
-      Rv,
       'Crowdloan',
       'AddedToNewRaise',
       { paraId: PolkadotParachainPrimitivesPrimitivesId }
@@ -2792,7 +2588,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssignedSlots`'s events
@@ -2802,7 +2598,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain was assigned a permanent parachain slot
      **/
     PermanentSlotAssigned: GenericPalletEvent<
-      Rv,
       'AssignedSlots',
       'PermanentSlotAssigned',
       PolkadotParachainPrimitivesPrimitivesId
@@ -2812,7 +2607,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A parachain was assigned a temporary parachain slot
      **/
     TemporarySlotAssigned: GenericPalletEvent<
-      Rv,
       'AssignedSlots',
       'TemporarySlotAssigned',
       PolkadotParachainPrimitivesPrimitivesId
@@ -2821,17 +2615,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The maximum number of permanent slots has been changed
      **/
-    MaxPermanentSlotsChanged: GenericPalletEvent<Rv, 'AssignedSlots', 'MaxPermanentSlotsChanged', { slots: number }>;
+    MaxPermanentSlotsChanged: GenericPalletEvent<'AssignedSlots', 'MaxPermanentSlotsChanged', { slots: number }>;
 
     /**
      * The maximum number of temporary slots has been changed
      **/
-    MaxTemporarySlotsChanged: GenericPalletEvent<Rv, 'AssignedSlots', 'MaxTemporarySlotsChanged', { slots: number }>;
+    MaxTemporarySlotsChanged: GenericPalletEvent<'AssignedSlots', 'MaxTemporarySlotsChanged', { slots: number }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `Coretime`'s events
@@ -2840,17 +2634,17 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The broker chain has asked for revenue information for a specific block.
      **/
-    RevenueInfoRequested: GenericPalletEvent<Rv, 'Coretime', 'RevenueInfoRequested', { when: number }>;
+    RevenueInfoRequested: GenericPalletEvent<'Coretime', 'RevenueInfoRequested', { when: number }>;
 
     /**
      * A core has received a new assignment from the broker chain.
      **/
-    CoreAssigned: GenericPalletEvent<Rv, 'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
+    CoreAssigned: GenericPalletEvent<'Coretime', 'CoreAssigned', { core: PolkadotPrimitivesV8CoreIndex }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `StakingAhClient`'s events
@@ -2860,7 +2654,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A new validator set has been received.
      **/
     ValidatorSetReceived: GenericPalletEvent<
-      Rv,
       'StakingAhClient',
       'ValidatorSetReceived',
       { id: number; newValidatorSetCount: number; pruneUpTo?: number | undefined; leftover: boolean }
@@ -2872,24 +2665,24 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Note that this event is more resembling an error, but we use an event because in this
      * pallet we need to mutate storage upon some failures.
      **/
-    CouldNotMergeAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'CouldNotMergeAndDropped', null>;
+    CouldNotMergeAndDropped: GenericPalletEvent<'StakingAhClient', 'CouldNotMergeAndDropped', null>;
 
     /**
      * The validator set received is way too small, as per
      * [`Config::MinimumValidatorSetSize`].
      **/
-    SetTooSmallAndDropped: GenericPalletEvent<Rv, 'StakingAhClient', 'SetTooSmallAndDropped', null>;
+    SetTooSmallAndDropped: GenericPalletEvent<'StakingAhClient', 'SetTooSmallAndDropped', null>;
 
     /**
      * Something occurred that should never happen under normal operation. Logged as an event
      * for fail-safe observability.
      **/
-    Unexpected: GenericPalletEvent<Rv, 'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
+    Unexpected: GenericPalletEvent<'StakingAhClient', 'Unexpected', PalletStakingAsyncAhClientUnexpectedKind>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MultiBlockMigrations`'s events
@@ -2901,7 +2694,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Its end is indicated by `UpgradeCompleted` or `UpgradeFailed`.
      **/
     UpgradeStarted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'UpgradeStarted',
       {
@@ -2920,20 +2712,19 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      *
      * This implies that all of its migrations completed successfully as well.
      **/
-    UpgradeCompleted: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeCompleted', null>;
+    UpgradeCompleted: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeCompleted', null>;
 
     /**
      * Runtime upgrade failed.
      *
      * This is very bad and will require governance intervention.
      **/
-    UpgradeFailed: GenericPalletEvent<Rv, 'MultiBlockMigrations', 'UpgradeFailed', null>;
+    UpgradeFailed: GenericPalletEvent<'MultiBlockMigrations', 'UpgradeFailed', null>;
 
     /**
      * A migration was skipped since it was already executed in the past.
      **/
     MigrationSkipped: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationSkipped',
       {
@@ -2948,7 +2739,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A migration progressed.
      **/
     MigrationAdvanced: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationAdvanced',
       {
@@ -2968,7 +2758,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A Migration completed.
      **/
     MigrationCompleted: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationCompleted',
       {
@@ -2990,7 +2779,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This implies that the whole upgrade failed and governance intervention is required.
      **/
     MigrationFailed: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'MigrationFailed',
       {
@@ -3010,7 +2798,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The set of historical migrations has been cleared.
      **/
     HistoricCleared: GenericPalletEvent<
-      Rv,
       'MultiBlockMigrations',
       'HistoricCleared',
       {
@@ -3024,7 +2811,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `XcmPallet`'s events
@@ -3033,13 +2820,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Execution of an XCM message was attempted.
      **/
-    Attempted: GenericPalletEvent<Rv, 'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
+    Attempted: GenericPalletEvent<'XcmPallet', 'Attempted', { outcome: StagingXcmV5TraitsOutcome }>;
 
     /**
      * An XCM message was sent.
      **/
     Sent: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'Sent',
       {
@@ -3054,7 +2840,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to send.
      **/
     SendFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SendFailed',
       {
@@ -3069,7 +2854,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * An XCM message failed to process.
      **/
     ProcessXcmError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ProcessXcmError',
       { origin: StagingXcmV5Location; error: XcmV5TraitsError; messageId: FixedBytes<32> }
@@ -3081,7 +2865,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * because the query timed out.
      **/
     UnexpectedResponse: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'UnexpectedResponse',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3092,7 +2875,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * no registered notification call.
      **/
     ResponseReady: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'ResponseReady',
       { queryId: bigint; response: StagingXcmV5Response }
@@ -3102,12 +2884,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Query response has been received and query is removed. The registered notification has
      * been dispatched and executed successfully.
      **/
-    Notified: GenericPalletEvent<
-      Rv,
-      'XcmPallet',
-      'Notified',
-      { queryId: bigint; palletIndex: number; callIndex: number }
-    >;
+    Notified: GenericPalletEvent<'XcmPallet', 'Notified', { queryId: bigint; palletIndex: number; callIndex: number }>;
 
     /**
      * Query response has been received and query is removed. The registered notification
@@ -3115,7 +2892,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * originally budgeted by this runtime for the query result.
      **/
     NotifyOverweight: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyOverweight',
       {
@@ -3132,7 +2908,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * dispatching the notification call.
      **/
     NotifyDispatchError: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDispatchError',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3144,7 +2919,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * is not `(origin, QueryId, Response)`.
      **/
     NotifyDecodeFailed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyDecodeFailed',
       { queryId: bigint; palletIndex: number; callIndex: number }
@@ -3156,7 +2930,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidResponder: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponder',
       { origin: StagingXcmV5Location; queryId: bigint; expectedLocation?: StagingXcmV5Location | undefined }
@@ -3172,7 +2945,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidResponderVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidResponderVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3181,13 +2953,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Received query response has been read and removed.
      **/
-    ResponseTaken: GenericPalletEvent<Rv, 'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
+    ResponseTaken: GenericPalletEvent<'XcmPallet', 'ResponseTaken', { queryId: bigint }>;
 
     /**
      * Some assets have been placed in an asset trap.
      **/
     AssetsTrapped: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsTrapped',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -3199,7 +2970,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * The cost of sending it (borne by the chain) is included.
      **/
     VersionChangeNotified: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionChangeNotified',
       { destination: StagingXcmV5Location; result: number; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3210,7 +2980,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * automatic notification or a manual intervention.
      **/
     SupportedVersionChanged: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'SupportedVersionChanged',
       { location: StagingXcmV5Location; version: number }
@@ -3221,7 +2990,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * sending the notification to it.
      **/
     NotifyTargetSendFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetSendFail',
       { location: StagingXcmV5Location; queryId: bigint; error: XcmV5TraitsError }
@@ -3232,7 +3000,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * migrating the location to our new XCM format.
      **/
     NotifyTargetMigrationFail: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'NotifyTargetMigrationFail',
       { location: XcmVersionedLocation; queryId: bigint }
@@ -3248,7 +3015,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * needed.
      **/
     InvalidQuerierVersion: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerierVersion',
       { origin: StagingXcmV5Location; queryId: bigint }
@@ -3260,7 +3026,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * be received and acted upon.
      **/
     InvalidQuerier: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'InvalidQuerier',
       {
@@ -3276,7 +3041,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * A version information message is sent to them and its cost is included.
      **/
     VersionNotifyStarted: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyStarted',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3286,7 +3050,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * We have requested that a remote chain send us XCM version change notifications.
      **/
     VersionNotifyRequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyRequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3297,7 +3060,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * notifications.
      **/
     VersionNotifyUnrequested: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'VersionNotifyUnrequested',
       { destination: StagingXcmV5Location; cost: StagingXcmV5AssetAssets; messageId: FixedBytes<32> }
@@ -3307,7 +3069,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Fees were paid from a location for an operation (often for using `SendXcm`).
      **/
     FeesPaid: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'FeesPaid',
       { paying: StagingXcmV5Location; fees: StagingXcmV5AssetAssets }
@@ -3317,7 +3078,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Some assets have been claimed from an asset trap
      **/
     AssetsClaimed: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AssetsClaimed',
       { hash: H256; origin: StagingXcmV5Location; assets: XcmVersionedAssets }
@@ -3326,14 +3086,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * A XCM version migration finished.
      **/
-    VersionMigrationFinished: GenericPalletEvent<Rv, 'XcmPallet', 'VersionMigrationFinished', { version: number }>;
+    VersionMigrationFinished: GenericPalletEvent<'XcmPallet', 'VersionMigrationFinished', { version: number }>;
 
     /**
      * An `aliaser` location was authorized by `target` to alias it, authorization valid until
      * `expiry` block number.
      **/
     AliasAuthorized: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorized',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location; expiry?: bigint | undefined }
@@ -3343,7 +3102,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed alias authorization for `aliaser`.
      **/
     AliasAuthorizationRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasAuthorizationRemoved',
       { aliaser: StagingXcmV5Location; target: StagingXcmV5Location }
@@ -3353,7 +3111,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * `target` removed all alias authorizations.
      **/
     AliasesAuthorizationsRemoved: GenericPalletEvent<
-      Rv,
       'XcmPallet',
       'AliasesAuthorizationsRemoved',
       { target: StagingXcmV5Location }
@@ -3362,7 +3119,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MessageQueue`'s events
@@ -3372,7 +3129,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message discarded due to an error in the `MessageProcessor` (usually a format error).
      **/
     ProcessingFailed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'ProcessingFailed',
       {
@@ -3400,7 +3156,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message is processed.
      **/
     Processed: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'Processed',
       {
@@ -3435,7 +3190,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * Message placed in overweight queue.
      **/
     OverweightEnqueued: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'OverweightEnqueued',
       {
@@ -3465,7 +3219,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * This page was reaped.
      **/
     PageReaped: GenericPalletEvent<
-      Rv,
       'MessageQueue',
       'PageReaped',
       {
@@ -3484,26 +3237,23 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `AssetRate`'s events
    **/
   assetRate: {
     AssetRateCreated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateCreated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 }
     >;
     AssetRateRemoved: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateRemoved',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset }
     >;
     AssetRateUpdated: GenericPalletEvent<
-      Rv,
       'AssetRate',
       'AssetRateUpdated',
       { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; old: FixedU128; new: FixedU128 }
@@ -3512,7 +3262,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RootTesting`'s events
@@ -3521,12 +3271,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Event dispatched when the trigger_defensive extrinsic is called.
      **/
-    DefensiveTestCall: GenericPalletEvent<Rv, 'RootTesting', 'DefensiveTestCall', undefined>;
+    DefensiveTestCall: GenericPalletEvent<'RootTesting', 'DefensiveTestCall', undefined>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `MetaTx`'s events
@@ -3539,7 +3289,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
      * information.
      **/
     Dispatched: GenericPalletEvent<
-      Rv,
       'MetaTx',
       'Dispatched',
       { result: Result<FrameSupportDispatchPostDispatchInfo, SpRuntimeDispatchErrorWithPostInfo> }
@@ -3548,7 +3297,7 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `RootOffences`'s events
@@ -3557,17 +3306,12 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * An offence was created by root.
      **/
-    OffenceCreated: GenericPalletEvent<
-      Rv,
-      'RootOffences',
-      'OffenceCreated',
-      { offenders: Array<[AccountId32, Perbill]> }
-    >;
+    OffenceCreated: GenericPalletEvent<'RootOffences', 'OffenceCreated', { offenders: Array<[AccountId32, Perbill]> }>;
 
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
   /**
    * Pallet `IdentityMigrator`'s events
@@ -3576,14 +3320,13 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * The identity and all sub accounts were reaped for `who`.
      **/
-    IdentityReaped: GenericPalletEvent<Rv, 'IdentityMigrator', 'IdentityReaped', { who: AccountId32 }>;
+    IdentityReaped: GenericPalletEvent<'IdentityMigrator', 'IdentityReaped', { who: AccountId32 }>;
 
     /**
      * The deposits held for `who` were updated. `identity` is the new deposit held for
      * identity info, and `subs` is the new deposit held for the sub-accounts.
      **/
     DepositUpdated: GenericPalletEvent<
-      Rv,
       'IdentityMigrator',
       'DepositUpdated',
       { who: AccountId32; identity: bigint; subs: bigint }
@@ -3592,6 +3335,6 @@ export interface ChainEvents<Rv extends RpcVersion> extends GenericChainEvents<R
     /**
      * Generic pallet event
      **/
-    [prop: string]: GenericPalletEvent<Rv>;
+    [prop: string]: GenericPalletEvent;
   };
 }
diff --git a/packages/chaintypes/src/westend/index.d.ts b/packages/chaintypes/src/westend/index.d.ts
index c166b847..189c0b5c 100644
--- a/packages/chaintypes/src/westend/index.d.ts
+++ b/packages/chaintypes/src/westend/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericSubstrateApi, GenericChainKnownTypes, RpcLegacy, RpcV2, RpcVersion } from 'dedot/types';
+import type { GenericSubstrateApi, GenericChainKnownTypes } from 'dedot/types';
 import type { MultiAddress } from 'dedot/codecs';
 import type {
   WestendRuntimeRuntimeCall,
@@ -45,26 +45,22 @@ interface ChainKnownTypes extends GenericChainKnownTypes {
     FrameMetadataHashExtensionCheckMetadataHash,
     FrameSystemExtensionsWeightReclaim,
   ];
-}
-
-export interface VersionedWestendApi<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
-  rpc: ChainJsonRpcApis<Rv>;
-  consts: ChainConsts<Rv>;
-  query: ChainStorage<Rv>;
-  errors: ChainErrors<Rv>;
-  events: ChainEvents<Rv>;
-  call: RuntimeApis<Rv>;
-  view: ChainViewFunctions<Rv>;
-  tx: ChainTx<Rv>;
-
-  types: ChainKnownTypes;
+  AssetId: undefined;
 }
 
 /**
  * @name: WestendApi
  * @specVersion: 1020001
  **/
-export interface WestendApi {
-  legacy: VersionedWestendApi<RpcLegacy>;
-  v2: VersionedWestendApi<RpcV2>;
+export interface WestendApi extends GenericSubstrateApi {
+  rpc: ChainJsonRpcApis;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  view: ChainViewFunctions;
+  tx: ChainTx<ChainKnownTypes>;
+
+  types: ChainKnownTypes;
 }
diff --git a/packages/chaintypes/src/westend/json-rpc.d.ts b/packages/chaintypes/src/westend/json-rpc.d.ts
index e84f3571..c021a2b3 100644
--- a/packages/chaintypes/src/westend/json-rpc.d.ts
+++ b/packages/chaintypes/src/westend/json-rpc.d.ts
@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericJsonRpcApis, RpcVersion } from 'dedot/types';
+import type { GenericJsonRpcApis } from 'dedot/types';
 import type { JsonRpcApis } from 'dedot/types/json-rpc';
 
-export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
+export type ChainJsonRpcApis = Pick<
   JsonRpcApis,
   | 'archive_v1_body'
   | 'archive_v1_call'
@@ -103,4 +103,4 @@ export type ChainJsonRpcApis<Rv extends RpcVersion> = Pick<
   | 'transaction_v1_broadcast'
   | 'transaction_v1_stop'
 > &
-  GenericJsonRpcApis<Rv>;
+  GenericJsonRpcApis;
diff --git a/packages/chaintypes/src/westend/query.d.ts b/packages/chaintypes/src/westend/query.d.ts
index 19e2b3f3..9b5ec4d0 100644
--- a/packages/chaintypes/src/westend/query.d.ts
+++ b/packages/chaintypes/src/westend/query.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -152,7 +152,7 @@ import type {
   SpConsensusBeefyMmrBeefyAuthoritySet,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -163,35 +163,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -199,7 +199,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -207,28 +207,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -241,14 +241,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -265,21 +265,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -287,21 +287,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -314,12 +314,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -330,14 +330,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -345,14 +345,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -368,28 +368,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -404,7 +404,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -412,7 +412,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -420,7 +420,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -430,7 +430,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -441,7 +441,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -452,7 +452,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -460,7 +460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -468,7 +468,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -482,12 +482,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -498,7 +498,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -508,12 +508,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -525,12 +525,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -541,14 +541,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -579,7 +579,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -590,7 +590,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -600,7 +600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -608,7 +608,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -617,7 +617,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -625,7 +624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -635,18 +634,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -657,12 +656,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -673,14 +672,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -689,7 +688,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -699,28 +698,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -729,7 +728,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -740,7 +739,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -750,7 +749,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -760,14 +759,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -776,7 +775,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -802,14 +801,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -822,14 +821,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -838,7 +837,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -848,7 +847,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -858,7 +857,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -869,7 +868,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -884,7 +883,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -904,7 +903,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -931,7 +929,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -948,7 +945,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -964,7 +960,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -977,7 +973,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -990,7 +985,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -999,7 +994,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1008,14 +1003,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1024,7 +1019,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1033,7 +1028,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1041,7 +1036,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1049,7 +1044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1059,7 +1054,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1069,7 +1064,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1081,7 +1075,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1093,7 +1086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1106,7 +1098,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1118,7 +1109,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1127,12 +1118,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -1144,7 +1135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -1153,7 +1144,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -1161,7 +1151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -1173,19 +1163,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1198,7 +1188,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<WestendRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: WestendRuntimeRuntimeParametersKey) => WestendRuntimeRuntimeParametersValue | undefined,
       WestendRuntimeRuntimeParametersKey
     >;
@@ -1206,7 +1195,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1217,14 +1206,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1232,7 +1221,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1240,7 +1229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, WestendRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, WestendRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, WestendRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1251,7 +1240,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1259,7 +1248,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<WestendRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => WestendRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => WestendRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1268,7 +1257,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1276,7 +1264,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1287,28 +1275,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1316,7 +1304,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1333,19 +1321,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -1356,19 +1344,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1383,7 +1371,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -1391,7 +1379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1400,7 +1388,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1412,7 +1400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1422,7 +1410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1430,7 +1418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1443,7 +1431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1457,7 +1445,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1471,12 +1458,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -1488,11 +1475,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
-      AccountId32
-    >;
+    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
 
     /**
      * Active recovery attempts.
@@ -1504,7 +1487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -1517,12 +1499,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1534,11 +1516,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -1547,12 +1525,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -1563,7 +1541,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -1571,7 +1549,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -1579,11 +1557,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -1594,12 +1568,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1613,7 +1587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -1621,19 +1595,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1644,12 +1618,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1662,11 +1636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1674,16 +1644,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1696,7 +1662,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -1704,7 +1669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -1720,14 +1685,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -1736,7 +1701,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -1746,7 +1711,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -1756,7 +1721,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -1766,7 +1731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -1781,7 +1746,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -1793,7 +1758,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -1808,7 +1773,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -1821,12 +1785,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -1840,14 +1804,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -1857,7 +1821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -1865,7 +1829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -1875,12 +1839,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -1895,14 +1859,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -1915,7 +1879,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -1923,7 +1887,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -1931,7 +1895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -1939,7 +1903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -1948,7 +1912,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -1959,7 +1923,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -1969,7 +1932,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -1977,14 +1940,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -1993,14 +1956,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2009,14 +1972,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2024,21 +1987,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2049,14 +2012,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2064,16 +2027,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -2086,7 +2045,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -2096,14 +2055,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -2117,12 +2076,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -2136,7 +2095,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -2149,12 +2107,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -2165,7 +2123,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -2173,7 +2131,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -2184,7 +2142,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -2192,7 +2150,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -2205,12 +2163,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -2221,12 +2179,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2240,7 +2198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2251,14 +2209,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2268,14 +2226,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -2283,19 +2241,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2311,7 +2269,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2321,7 +2278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2329,23 +2286,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Configuration`'s storage queries
@@ -2356,7 +2309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsConfigurationHostConfiguration> =} callback
      **/
-    activeConfig: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
+    activeConfig: GenericStorageQuery<() => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
 
     /**
      * Pending configuration changes.
@@ -2369,10 +2322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>> =} callback
      **/
-    pendingConfigs: GenericStorageQuery<
-      Rv,
-      () => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>
-    >;
+    pendingConfigs: GenericStorageQuery<() => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>>;
 
     /**
      * If this is set, then the configuration setters will bypass the consistency checks. This
@@ -2380,12 +2330,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    bypassConsistencyCheck: GenericStorageQuery<Rv, () => boolean>;
+    bypassConsistencyCheck: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasShared`'s storage queries
@@ -2396,7 +2346,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * All the validators actively participating in parachain consensus.
@@ -2404,7 +2354,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex>> =} callback
      **/
-    activeValidatorIndices: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorIndex>>;
+    activeValidatorIndices: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorIndex>>;
 
     /**
      * The parachain attestation keys of the validators actively participating in parachain
@@ -2412,19 +2362,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorAppPublic>> =} callback
      **/
-    activeValidatorKeys: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
+    activeValidatorKeys: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
 
     /**
      * All allowed relay-parents.
      *
      * @param {Callback<PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker> =} callback
      **/
-    allowedRelayParents: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
+    allowedRelayParents: GenericStorageQuery<() => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInclusion`'s storage queries
@@ -2441,7 +2391,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined> =} callback
      **/
     v1: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined,
@@ -2451,7 +2400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInherent`'s storage queries
@@ -2467,19 +2416,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    included: GenericStorageQuery<Rv, () => [] | undefined>;
+    included: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Scraped on chain data for extracting resolved disputes as well as backing votes.
      *
      * @param {Callback<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined> =} callback
      **/
-    onChainVotes: GenericStorageQuery<Rv, () => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
+    onChainVotes: GenericStorageQuery<() => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaScheduler`'s storage queries
@@ -2496,7 +2445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Array<PolkadotPrimitivesV8ValidatorIndex>>> =} callback
      **/
-    validatorGroups: GenericStorageQuery<Rv, () => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    validatorGroups: GenericStorageQuery<() => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * The block number where the session start occurred. Used to track how many group rotations
@@ -2509,7 +2458,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    sessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * One entry for each availability core. The `VecDeque` represents the assignments to be
@@ -2518,14 +2467,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>> =} callback
      **/
     claimQueue: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Paras`'s storage queries
@@ -2541,7 +2489,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined> =} callback
      **/
     pvfActiveVoteMap: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined,
@@ -2553,7 +2500,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>> =} callback
      **/
-    pvfActiveVoteList: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
+    pvfActiveVoteList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
 
     /**
      * All lease holding parachains. Ordered ascending by `ParaId`. On demand parachains are not
@@ -2563,7 +2510,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachains: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The current lifecycle of a all known Para IDs.
@@ -2572,7 +2519,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaLifecycle | undefined> =} callback
      **/
     paraLifecycles: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaLifecycle | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2584,7 +2530,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesHeadData | undefined> =} callback
      **/
     heads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesHeadData | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2596,7 +2541,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     mostRecentContext: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2610,7 +2554,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     currentCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2627,7 +2570,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     pastCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: [PolkadotParachainPrimitivesPrimitivesId, number],
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2643,7 +2585,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaPastCodeMeta> =} callback
      **/
     pastCodeMeta: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaPastCodeMeta,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2658,7 +2599,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    pastCodePruning: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    pastCodePruning: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The block number at which the planned code change is expected for a parachain.
@@ -2670,7 +2611,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     futureCodeUpgrades: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2687,7 +2627,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    futureCodeUpgradesAt: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    futureCodeUpgradesAt: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actual future code hash of a para.
@@ -2698,7 +2638,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     futureCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2712,7 +2651,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined> =} callback
      **/
     authorizedCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined,
@@ -2735,7 +2673,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
     upgradeGoAheadSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeGoAhead | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2755,7 +2692,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
     upgradeRestrictionSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeRestriction | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2767,7 +2703,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upgradeCooldowns: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upgradeCooldowns: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The list of upcoming code upgrades.
@@ -2779,7 +2715,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upcomingUpgrades: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upcomingUpgrades: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actions to perform during the start of a specific session index.
@@ -2787,7 +2723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    actionsQueue: GenericStorageQuery<Rv, (arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
+    actionsQueue: GenericStorageQuery<(arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
 
     /**
      * Upcoming paras instantiation arguments.
@@ -2799,7 +2735,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaGenesisArgs | undefined> =} callback
      **/
     upcomingParasGenesis: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaGenesisArgs | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2811,7 +2746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     codeByHashRefs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => number,
       PolkadotParachainPrimitivesPrimitivesValidationCodeHash
     >;
@@ -2826,7 +2760,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined> =} callback
      **/
     codeByHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCode | undefined,
@@ -2836,7 +2769,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Initializer`'s storage queries
@@ -2854,7 +2787,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    hasInitialized: GenericStorageQuery<Rv, () => [] | undefined>;
+    hasInitialized: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Buffered session changes.
@@ -2867,15 +2800,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>> =} callback
      **/
-    bufferedSessionChanges: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>
-    >;
+    bufferedSessionChanges: GenericStorageQuery<() => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dmp`'s storage queries
@@ -2888,7 +2818,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundDownwardMessage>> =} callback
      **/
     downwardMessageQueues: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotCorePrimitivesInboundDownwardMessage>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2906,7 +2835,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256> =} callback
      **/
     downwardMessageQueueHeads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => H256,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2918,7 +2846,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2926,7 +2853,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hrmp`'s storage queries
@@ -2944,7 +2871,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined> =} callback
      **/
     hrmpOpenChannelRequests: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
       ) => PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined,
@@ -2955,10 +2881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpOpenChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpOpenChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * This mapping tracks how many open channel requests are initiated by a given sender para.
@@ -2969,7 +2892,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpOpenChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2983,7 +2905,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpAcceptedChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3001,7 +2922,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     hrmpCloseChannelRequests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => [] | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3010,10 +2930,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpCloseChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpCloseChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * The HRMP watermark associated with each para.
@@ -3025,7 +2942,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     hrmpWatermarks: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3039,7 +2955,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpChannel | undefined> =} callback
      **/
     hrmpChannels: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => PolkadotRuntimeParachainsHrmpHrmpChannel | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3063,7 +2978,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpIngressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3074,7 +2988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpEgressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3087,7 +3000,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundHrmpMessage>> =} callback
      **/
     hrmpChannelContents: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => Array<PolkadotCorePrimitivesInboundHrmpMessage>,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3104,7 +3016,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>> =} callback
      **/
     hrmpChannelDigests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3112,7 +3023,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaSessionInfo`'s storage queries
@@ -3125,14 +3036,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8AssignmentAppPublic>> =} callback
      **/
-    assignmentKeysUnsafe: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
+    assignmentKeysUnsafe: GenericStorageQuery<() => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
 
     /**
      * The earliest session for which previous session info is stored.
      *
      * @param {Callback<number> =} callback
      **/
-    earliestStoredSession: GenericStorageQuery<Rv, () => number>;
+    earliestStoredSession: GenericStorageQuery<() => number>;
 
     /**
      * Session information in a rolling window.
@@ -3142,7 +3053,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8SessionInfo | undefined> =} callback
      **/
-    sessions: GenericStorageQuery<Rv, (arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
+    sessions: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
 
     /**
      * The validator account keys of the validators actively participating in parachain consensus.
@@ -3150,7 +3061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
-    accountKeys: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32> | undefined, number>;
+    accountKeys: GenericStorageQuery<(arg: number) => Array<AccountId32> | undefined, number>;
 
     /**
      * Executor parameter set for a given session index
@@ -3158,16 +3069,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8ExecutorParams | undefined> =} callback
      **/
-    sessionExecutorParams: GenericStorageQuery<
-      Rv,
-      (arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined,
-      number
-    >;
+    sessionExecutorParams: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasDisputes`'s storage queries
@@ -3179,7 +3086,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastPrunedSession: GenericStorageQuery<Rv, () => number | undefined>;
+    lastPrunedSession: GenericStorageQuery<() => number | undefined>;
 
     /**
      * All ongoing or concluded disputes for the last several sessions.
@@ -3188,7 +3095,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8DisputeState | undefined> =} callback
      **/
     disputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesV8DisputeState | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3201,7 +3107,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex> | undefined> =} callback
      **/
     backersOnDisputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => Array<PolkadotPrimitivesV8ValidatorIndex> | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3214,7 +3119,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     included: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => number | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3227,12 +3131,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    frozen: GenericStorageQuery<Rv, () => number | undefined>;
+    frozen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasSlashing`'s storage queries
@@ -3245,7 +3149,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesVstagingPendingSlashes | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesVstagingPendingSlashes | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3256,12 +3159,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetCounts: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    validatorSetCounts: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s storage queries
@@ -3276,7 +3179,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined> =} callback
      **/
     paraIdAffinity: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined,
@@ -3288,14 +3190,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesQueueStatusType> =} callback
      **/
-    queueStatus: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
+    queueStatus: GenericStorageQuery<() => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
 
     /**
      * Priority queue for all orders which don't yet (or not any more) have any core affinity.
      *
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
-    freeEntries: GenericStorageQuery<Rv, () => BinaryHeapEnqueuedOrder>;
+    freeEntries: GenericStorageQuery<() => BinaryHeapEnqueuedOrder>;
 
     /**
      * Queue entries that are currently bound to a particular core due to core affinity.
@@ -3304,7 +3206,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
     affinityEntries: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => BinaryHeapEnqueuedOrder,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3314,7 +3215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<bigint>> =} callback
      **/
-    revenue: GenericStorageQuery<Rv, () => Array<bigint>>;
+    revenue: GenericStorageQuery<() => Array<bigint>>;
 
     /**
      * Keeps track of credits owned by each account.
@@ -3322,12 +3223,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    credits: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    credits: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s storage queries
@@ -3343,7 +3244,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined> =} callback
      **/
     coreSchedules: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotPrimitivesV8CoreIndex]) => PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined,
       [number, PolkadotPrimitivesV8CoreIndex]
     >;
@@ -3358,7 +3258,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor> =} callback
      **/
     coreDescriptors: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3366,7 +3265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Registrar`'s storage queries
@@ -3379,7 +3278,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId | undefined> =} callback
      **/
     pendingSwap: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesId | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3394,7 +3292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonParasRegistrarParaInfo | undefined> =} callback
      **/
     paras: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonParasRegistrarParaInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3404,12 +3301,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    nextFreeParaId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    nextFreeParaId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Slots`'s storage queries
@@ -3437,7 +3334,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint] | undefined>> =} callback
      **/
     leases: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[AccountId32, bigint] | undefined>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3445,7 +3341,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Auctions`'s storage queries
@@ -3456,7 +3352,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    auctionCounter: GenericStorageQuery<Rv, () => number>;
+    auctionCounter: GenericStorageQuery<() => number>;
 
     /**
      * Information relating to the current auction, if there is one.
@@ -3467,7 +3363,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    auctionInfo: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    auctionInfo: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Amounts currently reserved in the accounts of the bidders currently winning
@@ -3477,7 +3373,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     reservedAmounts: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PolkadotParachainPrimitivesPrimitivesId]) => bigint | undefined,
       [AccountId32, PolkadotParachainPrimitivesPrimitivesId]
     >;
@@ -3491,7 +3386,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined> =} callback
      **/
     winning: GenericStorageQuery<
-      Rv,
       (
         arg: number,
       ) => FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined,
@@ -3501,7 +3395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Crowdloan`'s storage queries
@@ -3514,7 +3408,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonCrowdloanFundInfo | undefined> =} callback
      **/
     funds: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonCrowdloanFundInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3525,26 +3418,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    newRaise: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    newRaise: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The number of auctions that have entered into their ending period so far.
      *
      * @param {Callback<number> =} callback
      **/
-    endingsCount: GenericStorageQuery<Rv, () => number>;
+    endingsCount: GenericStorageQuery<() => number>;
 
     /**
      * Tracker for the next available fund index
      *
      * @param {Callback<number> =} callback
      **/
-    nextFundIndex: GenericStorageQuery<Rv, () => number>;
+    nextFundIndex: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssignedSlots`'s storage queries
@@ -3557,7 +3450,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, number] | undefined> =} callback
      **/
     permanentSlots: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => [number, number] | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3567,7 +3459,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    permanentSlotCount: GenericStorageQuery<Rv, () => number>;
+    permanentSlotCount: GenericStorageQuery<() => number>;
 
     /**
      * Assigned temporary slots.
@@ -3576,7 +3468,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonAssignedSlotsParachainTemporarySlot | undefined> =} callback
      **/
     temporarySlots: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeCommonAssignedSlotsParachainTemporarySlot | undefined,
@@ -3588,33 +3479,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    temporarySlotCount: GenericStorageQuery<Rv, () => number>;
+    temporarySlotCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active temporary slots in current slot lease period.
      *
      * @param {Callback<number> =} callback
      **/
-    activeTemporarySlotCount: GenericStorageQuery<Rv, () => number>;
+    activeTemporarySlotCount: GenericStorageQuery<() => number>;
 
     /**
      * The max number of temporary slots that can be assigned.
      *
      * @param {Callback<number> =} callback
      **/
-    maxTemporarySlots: GenericStorageQuery<Rv, () => number>;
+    maxTemporarySlots: GenericStorageQuery<() => number>;
 
     /**
      * The max number of permanent slots that can be assigned.
      *
      * @param {Callback<number> =} callback
      **/
-    maxPermanentSlots: GenericStorageQuery<Rv, () => number>;
+    maxPermanentSlots: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingAhClient`'s storage queries
@@ -3627,17 +3518,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    validatorSet: GenericStorageQuery<Rv, () => [number, Array<AccountId32>] | undefined>;
+    validatorSet: GenericStorageQuery<() => [number, Array<AccountId32>] | undefined>;
 
     /**
      * An incomplete validator set report.
      *
      * @param {Callback<PalletStakingAsyncRcClientValidatorSetReport | undefined> =} callback
      **/
-    incompleteValidatorSetReport: GenericStorageQuery<
-      Rv,
-      () => PalletStakingAsyncRcClientValidatorSetReport | undefined
-    >;
+    incompleteValidatorSetReport: GenericStorageQuery<() => PalletStakingAsyncRcClientValidatorSetReport | undefined>;
 
     /**
      * All of the points of the validators.
@@ -3648,7 +3536,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    validatorPoints: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    validatorPoints: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Indicates the current operating mode of the pallet.
@@ -3658,7 +3546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncAhClientOperatingMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletStakingAsyncAhClientOperatingMode>;
+    mode: GenericStorageQuery<() => PalletStakingAsyncAhClientOperatingMode>;
 
     /**
      * A storage value that is set when a `new_session` gives a new validator set to the session
@@ -3672,7 +3560,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextSessionChangesValidators: GenericStorageQuery<Rv, () => number | undefined>;
+    nextSessionChangesValidators: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The session index at which the latest elected validator set was applied.
@@ -3682,7 +3570,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetAppliedAt: GenericStorageQuery<Rv, () => number | undefined>;
+    validatorSetAppliedAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A session report that is outgoing, and should be sent.
@@ -3692,7 +3580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientSessionReport, number] | undefined> =} callback
      **/
-    outgoingSessionReport: GenericStorageQuery<Rv, () => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
+    outgoingSessionReport: GenericStorageQuery<() => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
 
     /**
      * Internal storage item of [`OffenceSendQueue`]. Should not be used manually.
@@ -3701,7 +3589,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, PalletStakingAsyncRcClientOffence]>> =} callback
      **/
     offenceSendQueueOffences: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<[number, PalletStakingAsyncRcClientOffence]>,
       number
     >;
@@ -3711,12 +3598,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    offenceSendQueueCursor: GenericStorageQuery<Rv, () => number>;
+    offenceSendQueueCursor: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -3729,7 +3616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -3740,12 +3627,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmPallet`'s storage queries
@@ -3756,7 +3643,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -3764,7 +3651,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -3775,7 +3662,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -3783,7 +3670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -3792,7 +3679,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3804,7 +3690,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3817,7 +3702,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3829,14 +3713,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -3845,7 +3729,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -3857,7 +3740,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -3867,7 +3749,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -3880,7 +3762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -3892,7 +3774,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -3903,7 +3785,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -3911,7 +3792,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -3924,7 +3805,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin) => PalletMessageQueueBookState,
       PolkadotRuntimeParachainsInclusionAggregateMessageOrigin
     >;
@@ -3934,7 +3814,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -3943,7 +3823,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]
     >;
@@ -3951,7 +3830,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3966,7 +3845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3974,7 +3852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -3985,21 +3863,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -4016,7 +3894,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -4025,12 +3903,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -4041,14 +3919,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -4059,12 +3937,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BeefyMmrLeaf`'s storage queries
@@ -4075,7 +3953,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -4084,11 +3962,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }
diff --git a/packages/chaintypes/src/westend/runtime.d.ts b/packages/chaintypes/src/westend/runtime.d.ts
index 5bf2e776..1a9a42d5 100644
--- a/packages/chaintypes/src/westend/runtime.d.ts
+++ b/packages/chaintypes/src/westend/runtime.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericRuntimeApis, GenericRuntimeApiMethod, RpcVersion } from 'dedot/types';
+import type { GenericRuntimeApis, GenericRuntimeApiMethod } from 'dedot/types';
 import type {
   RuntimeVersion,
   Header,
@@ -93,7 +93,7 @@ import type {
   XcmVersionedAsset,
 } from './types.js';
 
-export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<Rv> {
+export interface RuntimeApis extends GenericRuntimeApis {
   /**
    * @runtimeapi: Core - 0xdf6acb689907609b
    **/
@@ -103,7 +103,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Core_version
      **/
-    version: GenericRuntimeApiMethod<Rv, () => Promise<RuntimeVersion>>;
+    version: GenericRuntimeApiMethod<() => Promise<RuntimeVersion>>;
 
     /**
      * Execute the given block.
@@ -111,7 +111,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_execute_block
      * @param {SpRuntimeBlock} block
      **/
-    executeBlock: GenericRuntimeApiMethod<Rv, (block: SpRuntimeBlock) => Promise<[]>>;
+    executeBlock: GenericRuntimeApiMethod<(block: SpRuntimeBlock) => Promise<[]>>;
 
     /**
      * Initialize a block with the given header and return the runtime executive mode.
@@ -119,12 +119,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Core_initialize_block
      * @param {Header} header
      **/
-    initializeBlock: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
+    initializeBlock: GenericRuntimeApiMethod<(header: Header) => Promise<SpRuntimeExtrinsicInclusionMode>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: Metadata - 0x37e397fc7c91f5e4
@@ -135,7 +135,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata
      **/
-    metadata: GenericRuntimeApiMethod<Rv, () => Promise<SpCoreOpaqueMetadata>>;
+    metadata: GenericRuntimeApiMethod<() => Promise<SpCoreOpaqueMetadata>>;
 
     /**
      * Returns the metadata at a given version.
@@ -146,7 +146,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: Metadata_metadata_at_version
      * @param {number} version
      **/
-    metadataAtVersion: GenericRuntimeApiMethod<Rv, (version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
+    metadataAtVersion: GenericRuntimeApiMethod<(version: number) => Promise<SpCoreOpaqueMetadata | undefined>>;
 
     /**
      * Returns the supported metadata versions.
@@ -155,12 +155,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: Metadata_metadata_versions
      **/
-    metadataVersions: GenericRuntimeApiMethod<Rv, () => Promise<Array<number>>>;
+    metadataVersions: GenericRuntimeApiMethod<() => Promise<Array<number>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: RuntimeViewFunction - 0xccd9de6396c899ca
@@ -174,7 +174,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} input
      **/
     executeViewFunction: GenericRuntimeApiMethod<
-      Rv,
       (
         queryId: FrameSupportViewFunctionsViewFunctionId,
         input: BytesLike,
@@ -184,7 +183,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BlockBuilder - 0x40fe3ad401f8959a
@@ -200,7 +199,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {UncheckedExtrinsicLike} extrinsic
      **/
     applyExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         extrinsic: UncheckedExtrinsicLike,
       ) => Promise<Result<Result<[], DispatchError>, SpRuntimeTransactionValidityTransactionValidityError>>
@@ -211,7 +209,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BlockBuilder_finalize_block
      **/
-    finalizeBlock: GenericRuntimeApiMethod<Rv, () => Promise<Header>>;
+    finalizeBlock: GenericRuntimeApiMethod<() => Promise<Header>>;
 
     /**
      * Generate inherent extrinsics. The inherent data will vary from chain to chain.
@@ -220,7 +218,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} inherent
      **/
     inherentExtrinsics: GenericRuntimeApiMethod<
-      Rv,
       (inherent: SpInherentsInherentData) => Promise<Array<UncheckedExtrinsic>>
     >;
 
@@ -232,14 +229,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpInherentsInherentData} data
      **/
     checkInherents: GenericRuntimeApiMethod<
-      Rv,
       (block: SpRuntimeBlock, data: SpInherentsInherentData) => Promise<SpInherentsCheckInherentsResult>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TaggedTransactionQueue - 0xd2bc9897eed08f15
@@ -262,7 +258,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} block_hash
      **/
     validateTransaction: GenericRuntimeApiMethod<
-      Rv,
       (
         source: SpRuntimeTransactionValidityTransactionSource,
         tx: UncheckedExtrinsicLike,
@@ -275,7 +270,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: OffchainWorkerApi - 0xf78b278be53f454c
@@ -287,12 +282,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: OffchainWorkerApi_offchain_worker
      * @param {Header} header
      **/
-    offchainWorker: GenericRuntimeApiMethod<Rv, (header: Header) => Promise<[]>>;
+    offchainWorker: GenericRuntimeApiMethod<(header: Header) => Promise<[]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: ParachainHost - 0xaf2c0297a23e6d3d
@@ -303,7 +298,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validators
      **/
-    validators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
+    validators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorAppPublic>>>;
 
     /**
      * Returns the validator groups and rotation info localized based on the hypothetical child
@@ -313,7 +308,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_validator_groups
      **/
     validatorGroups: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<[Array<Array<PolkadotPrimitivesV8ValidatorIndex>>, PolkadotPrimitivesV8GroupRotationInfo]>
     >;
 
@@ -323,7 +317,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_availability_cores
      **/
-    availabilityCores: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
+    availabilityCores: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCoreState>>>;
 
     /**
      * Yields the persisted validation data for the given `ParaId` along with an assumption that
@@ -337,7 +331,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     persistedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -354,7 +347,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {H256} expected_persisted_validation_data_hash
      **/
     assumedValidationData: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         expectedPersistedValidationDataHash: H256,
@@ -372,7 +364,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8CandidateCommitments} outputs
      **/
     checkValidationOutputs: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         outputs: PolkadotPrimitivesV8CandidateCommitments,
@@ -386,7 +377,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_session_index_for_child
      **/
-    sessionIndexForChild: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    sessionIndexForChild: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Fetch the validation code used by a para, making the given `OccupiedCoreAssumption`.
@@ -399,7 +390,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCode: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -414,7 +404,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatePendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2 | undefined>
@@ -425,7 +414,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_candidate_events
      **/
-    candidateEvents: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
+    candidateEvents: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesVstagingCandidateEvent>>>;
 
     /**
      * Get all the pending inbound messages in the downward message queue for a para.
@@ -434,7 +423,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     dmqContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotCorePrimitivesInboundDownwardMessage>>
@@ -448,7 +436,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     inboundHrmpChannelsContents: GenericRuntimeApiMethod<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<[PolkadotParachainPrimitivesPrimitivesId, Array<PolkadotCorePrimitivesInboundHrmpMessage>]>>
@@ -461,7 +448,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} hash
      **/
     validationCodeByHash: GenericRuntimeApiMethod<
-      Rv,
       (
         hash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => Promise<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined>
@@ -472,7 +458,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_on_chain_votes
      **/
-    onChainVotes: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
+    onChainVotes: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>>;
 
     /**
      * Get the session info for the given session, if stored.
@@ -482,7 +468,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_session_info
      * @param {number} index
      **/
-    sessionInfo: GenericRuntimeApiMethod<Rv, (index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
+    sessionInfo: GenericRuntimeApiMethod<(index: number) => Promise<PolkadotPrimitivesV8SessionInfo | undefined>>;
 
     /**
      * Submits a PVF pre-checking statement into the transaction pool.
@@ -494,7 +480,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     submitPvfCheckStatement: GenericRuntimeApiMethod<
-      Rv,
       (stmt: PolkadotPrimitivesV8PvfCheckStatement, signature: PolkadotPrimitivesV8ValidatorAppSignature) => Promise<[]>
     >;
 
@@ -506,7 +491,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_pvfs_require_precheck
      **/
     pvfsRequirePrecheck: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>
     >;
 
@@ -520,7 +504,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8OccupiedCoreAssumption} assumption
      **/
     validationCodeHash: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
         assumption: PolkadotPrimitivesV8OccupiedCoreAssumption,
@@ -533,7 +516,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_disputes
      **/
     disputes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8DisputeState]>>
     >;
 
@@ -544,7 +526,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} session_index
      **/
     sessionExecutorParams: GenericRuntimeApiMethod<
-      Rv,
       (sessionIndex: number) => Promise<PolkadotPrimitivesV8ExecutorParams | undefined>
     >;
 
@@ -555,7 +536,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_unapplied_slashes
      **/
     unappliedSlashes: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[number, PolkadotCorePrimitivesCandidateHash, PolkadotPrimitivesV8SlashingPendingSlashes]>>
     >;
 
@@ -567,7 +547,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8ValidatorAppPublic} validator_id
      **/
     keyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         validatorId: PolkadotPrimitivesV8ValidatorAppPublic,
       ) => Promise<PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof | undefined>
@@ -583,7 +562,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof} key_ownership_proof
      **/
     submitReportDisputeLost: GenericRuntimeApiMethod<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesV8SlashingDisputeProof,
         keyOwnershipProof: PolkadotPrimitivesV8SlashingOpaqueKeyOwnershipProof,
@@ -596,7 +574,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_minimum_backing_votes
      **/
-    minimumBackingVotes: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    minimumBackingVotes: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the state of parachain backing for a given para.
@@ -605,7 +583,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} __runtime_api_generated_name_0__
      **/
     paraBackingState: GenericRuntimeApiMethod<
-      Rv,
       (
         runtimeApiGeneratedName0: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingBackingState | undefined>
@@ -616,14 +593,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_async_backing_params
      **/
-    asyncBackingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
+    asyncBackingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8AsyncBackingAsyncBackingParams>>;
 
     /**
      * Returns a list of all disabled validators at the given block.
      *
      * @callname: ParachainHost_disabled_validators
      **/
-    disabledValidators: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    disabledValidators: GenericRuntimeApiMethod<() => Promise<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * Get node features.
@@ -631,14 +608,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_node_features
      **/
-    nodeFeatures: GenericRuntimeApiMethod<Rv, () => Promise<BitSequence>>;
+    nodeFeatures: GenericRuntimeApiMethod<() => Promise<BitSequence>>;
 
     /**
      * Approval voting configuration parameters
      *
      * @callname: ParachainHost_approval_voting_params
      **/
-    approvalVotingParams: GenericRuntimeApiMethod<Rv, () => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
+    approvalVotingParams: GenericRuntimeApiMethod<() => Promise<PolkadotPrimitivesV8ApprovalVotingParams>>;
 
     /**
      * Claim queue
@@ -646,7 +623,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: ParachainHost_claim_queue
      **/
     claimQueue: GenericRuntimeApiMethod<
-      Rv,
       () => Promise<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotParachainPrimitivesPrimitivesId>]>>
     >;
 
@@ -657,7 +633,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     candidatesPendingAvailability: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<Array<PolkadotPrimitivesVstagingCommittedCandidateReceiptV2>>
@@ -668,7 +643,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_validation_code_bomb_limit
      **/
-    validationCodeBombLimit: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    validationCodeBombLimit: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Returns the constraints on the actions that can be taken by a new parachain
@@ -678,7 +653,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {PolkadotParachainPrimitivesPrimitivesId} para_id
      **/
     backingConstraints: GenericRuntimeApiMethod<
-      Rv,
       (
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => Promise<PolkadotPrimitivesVstagingAsyncBackingConstraints | undefined>
@@ -689,19 +663,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: ParachainHost_scheduling_lookahead
      **/
-    schedulingLookahead: GenericRuntimeApiMethod<Rv, () => Promise<number>>;
+    schedulingLookahead: GenericRuntimeApiMethod<() => Promise<number>>;
 
     /**
      * Retrieve paraids at relay parent
      *
      * @callname: ParachainHost_para_ids
      **/
-    paraIds: GenericRuntimeApiMethod<Rv, () => Promise<Array<PolkadotParachainPrimitivesPrimitivesId>>>;
+    paraIds: GenericRuntimeApiMethod<() => Promise<Array<PolkadotParachainPrimitivesPrimitivesId>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyApi - 0x49eaaf1b548a0cb0
@@ -712,14 +686,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyApi_beefy_genesis
      **/
-    beefyGenesis: GenericRuntimeApiMethod<Rv, () => Promise<number | undefined>>;
+    beefyGenesis: GenericRuntimeApiMethod<() => Promise<number | undefined>>;
 
     /**
      * Return the current active BEEFY validator set
      *
      * @callname: BeefyApi_validator_set
      **/
-    validatorSet: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyValidatorSet | undefined>>;
+    validatorSet: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyValidatorSet | undefined>>;
 
     /**
      * Submits an unsigned extrinsic to report a double voting equivocation. The caller
@@ -736,7 +710,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportDoubleVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -758,7 +731,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportForkVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProofOpaqueValue,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -780,7 +752,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportFutureBlockVotingUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -805,7 +776,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBeefyEcdsaCryptoPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusBeefyEcdsaCryptoPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -818,14 +788,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateAncestryProof: GenericRuntimeApiMethod<
-      Rv,
       (prevBlockNumber: number, bestKnownBlockNumber?: number | undefined) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: MmrApi - 0x91d5df18b0d2cf58
@@ -836,14 +805,14 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: MmrApi_mmr_root
      **/
-    mmrRoot: GenericRuntimeApiMethod<Rv, () => Promise<Result<H256, SpMmrPrimitivesError>>>;
+    mmrRoot: GenericRuntimeApiMethod<() => Promise<Result<H256, SpMmrPrimitivesError>>>;
 
     /**
      * Return the number of MMR blocks in the chain.
      *
      * @callname: MmrApi_mmr_leaf_count
      **/
-    mmrLeafCount: GenericRuntimeApiMethod<Rv, () => Promise<Result<bigint, SpMmrPrimitivesError>>>;
+    mmrLeafCount: GenericRuntimeApiMethod<() => Promise<Result<bigint, SpMmrPrimitivesError>>>;
 
     /**
      * Generate MMR proof for a series of block numbers. If `best_known_block_number = Some(n)`,
@@ -854,7 +823,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number | undefined} best_known_block_number
      **/
     generateProof: GenericRuntimeApiMethod<
-      Rv,
       (
         blockNumbers: Array<number>,
         bestKnownBlockNumber?: number | undefined,
@@ -873,7 +841,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProof: GenericRuntimeApiMethod<
-      Rv,
       (
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
         proof: SpMmrPrimitivesLeafProof,
@@ -895,7 +862,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpMmrPrimitivesLeafProof} proof
      **/
     verifyProofStateless: GenericRuntimeApiMethod<
-      Rv,
       (
         root: H256,
         leaves: Array<SpMmrPrimitivesEncodableOpaqueLeaf>,
@@ -906,7 +872,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BeefyMmrApi - 0x2a5e924655399e60
@@ -917,19 +883,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BeefyMmrApi_authority_set_proof
      **/
-    authoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    authoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Return the next/queued BEEFY authority set proof.
      *
      * @callname: BeefyMmrApi_next_authority_set_proof
      **/
-    nextAuthoritySetProof: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
+    nextAuthoritySetProof: GenericRuntimeApiMethod<() => Promise<SpConsensusBeefyMmrBeefyAuthoritySet>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GrandpaApi - 0xed99c5acb25eedf5
@@ -945,7 +911,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_grandpa_authorities
      **/
-    grandpaAuthorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
+    grandpaAuthorities: GenericRuntimeApiMethod<() => Promise<Array<[SpConsensusGrandpaAppPublic, bigint]>>>;
 
     /**
      * Submits an unsigned extrinsic to report an equivocation. The caller
@@ -962,7 +928,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpRuntimeOpaqueValue} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpRuntimeOpaqueValue,
@@ -987,7 +952,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusGrandpaAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (setId: bigint, authorityId: SpConsensusGrandpaAppPublic) => Promise<SpRuntimeOpaqueValue | undefined>
     >;
 
@@ -996,12 +960,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GrandpaApi_current_set_id
      **/
-    currentSetId: GenericRuntimeApiMethod<Rv, () => Promise<bigint>>;
+    currentSetId: GenericRuntimeApiMethod<() => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: BabeApi - 0xcbca25e39f142387
@@ -1012,21 +976,21 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_configuration
      **/
-    configuration: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeBabeConfiguration>>;
+    configuration: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeBabeConfiguration>>;
 
     /**
      * Returns the slot that started the current epoch.
      *
      * @callname: BabeApi_current_epoch_start
      **/
-    currentEpochStart: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusSlotsSlot>>;
+    currentEpochStart: GenericRuntimeApiMethod<() => Promise<SpConsensusSlotsSlot>>;
 
     /**
      * Returns information regarding the current epoch.
      *
      * @callname: BabeApi_current_epoch
      **/
-    currentEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    currentEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Returns information regarding the next epoch (which was already
@@ -1034,7 +998,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: BabeApi_next_epoch
      **/
-    nextEpoch: GenericRuntimeApiMethod<Rv, () => Promise<SpConsensusBabeEpoch>>;
+    nextEpoch: GenericRuntimeApiMethod<() => Promise<SpConsensusBabeEpoch>>;
 
     /**
      * Generates a proof of key ownership for the given authority in the
@@ -1054,7 +1018,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeAppPublic} authority_id
      **/
     generateKeyOwnershipProof: GenericRuntimeApiMethod<
-      Rv,
       (
         slot: SpConsensusSlotsSlot,
         authorityId: SpConsensusBabeAppPublic,
@@ -1076,7 +1039,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {SpConsensusBabeOpaqueKeyOwnershipProof} key_owner_proof
      **/
     submitReportEquivocationUnsignedExtrinsic: GenericRuntimeApiMethod<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpConsensusBabeOpaqueKeyOwnershipProof,
@@ -1086,7 +1048,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AuthorityDiscoveryApi - 0x687ad44ad37f03c2
@@ -1097,12 +1059,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: AuthorityDiscoveryApi_authorities
      **/
-    authorities: GenericRuntimeApiMethod<Rv, () => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
+    authorities: GenericRuntimeApiMethod<() => Promise<Array<SpAuthorityDiscoveryAppPublic>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: SessionKeys - 0xab3c0572291feb8b
@@ -1120,7 +1082,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: SessionKeys_generate_session_keys
      * @param {BytesLike | undefined} seed
      **/
-    generateSessionKeys: GenericRuntimeApiMethod<Rv, (seed?: BytesLike | undefined) => Promise<Bytes>>;
+    generateSessionKeys: GenericRuntimeApiMethod<(seed?: BytesLike | undefined) => Promise<Bytes>>;
 
     /**
      * Decode the given public session keys.
@@ -1131,14 +1093,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {BytesLike} encoded
      **/
     decodeSessionKeys: GenericRuntimeApiMethod<
-      Rv,
       (encoded: BytesLike) => Promise<Array<[Bytes, SpCoreCryptoKeyTypeId]> | undefined>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: AccountNonceApi - 0xbc9d89904f5b923f
@@ -1150,12 +1111,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: AccountNonceApi_account_nonce
      * @param {AccountId32Like} account
      **/
-    accountNonce: GenericRuntimeApiMethod<Rv, (account: AccountId32Like) => Promise<number>>;
+    accountNonce: GenericRuntimeApiMethod<(account: AccountId32Like) => Promise<number>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentApi - 0x37c8bb1350a9a2a8
@@ -1168,7 +1129,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryInfo: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1179,7 +1139,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (uxt: UncheckedExtrinsicLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1188,19 +1147,19 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      *
      * @callname: TransactionPaymentApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TransactionPaymentCallApi - 0xf3ff14d5ab527059
@@ -1214,7 +1173,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallInfo: GenericRuntimeApiMethod<
-      Rv,
       (call: WestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentRuntimeDispatchInfo>
     >;
 
@@ -1226,7 +1184,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} len
      **/
     queryCallFeeDetails: GenericRuntimeApiMethod<
-      Rv,
       (call: WestendRuntimeRuntimeCallLike, len: number) => Promise<PalletTransactionPaymentFeeDetails>
     >;
 
@@ -1236,7 +1193,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_weight_to_fee
      * @param {SpWeightsWeightV2Weight} weight
      **/
-    queryWeightToFee: GenericRuntimeApiMethod<Rv, (weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
+    queryWeightToFee: GenericRuntimeApiMethod<(weight: SpWeightsWeightV2Weight) => Promise<bigint>>;
 
     /**
      * Query the output of the current `LengthToFee` given some input.
@@ -1244,12 +1201,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: TransactionPaymentCallApi_query_length_to_fee
      * @param {number} length
      **/
-    queryLengthToFee: GenericRuntimeApiMethod<Rv, (length: number) => Promise<bigint>>;
+    queryLengthToFee: GenericRuntimeApiMethod<(length: number) => Promise<bigint>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: XcmPaymentApi - 0x6ff52ee858e6c5bd
@@ -1266,7 +1223,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} xcm_version
      **/
     queryAcceptablePaymentAssets: GenericRuntimeApiMethod<
-      Rv,
       (xcmVersion: number) => Promise<Result<Array<XcmVersionedAssetId>, XcmRuntimeApisFeesError>>
     >;
 
@@ -1281,7 +1237,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryXcmWeight: GenericRuntimeApiMethod<
-      Rv,
       (message: XcmVersionedXcm) => Promise<Result<SpWeightsWeightV2Weight, XcmRuntimeApisFeesError>>
     >;
 
@@ -1298,7 +1253,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedAssetId} asset
      **/
     queryWeightToAssetFee: GenericRuntimeApiMethod<
-      Rv,
       (weight: SpWeightsWeightV2Weight, asset: XcmVersionedAssetId) => Promise<Result<bigint, XcmRuntimeApisFeesError>>
     >;
 
@@ -1317,7 +1271,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} message
      **/
     queryDeliveryFees: GenericRuntimeApiMethod<
-      Rv,
       (
         destination: XcmVersionedLocation,
         message: XcmVersionedXcm,
@@ -1327,7 +1280,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: DryRunApi - 0x91b1c8b16328eb92
@@ -1342,7 +1295,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} result_xcms_version
      **/
     dryRunCall: GenericRuntimeApiMethod<
-      Rv,
       (
         origin: WestendRuntimeOriginCaller,
         call: WestendRuntimeRuntimeCallLike,
@@ -1358,7 +1310,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedXcm} xcm
      **/
     dryRunXcm: GenericRuntimeApiMethod<
-      Rv,
       (
         originLocation: XcmVersionedLocation,
         xcm: XcmVersionedXcm,
@@ -1368,7 +1319,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: LocationToAccountApi - 0x9ffb505aa738d69c
@@ -1381,14 +1332,13 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     convertLocation: GenericRuntimeApiMethod<
-      Rv,
       (location: XcmVersionedLocation) => Promise<Result<AccountId32, XcmRuntimeApisConversionsError>>
     >;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: NominationPoolsApi - 0x17a6bc0d0062aeb3
@@ -1400,7 +1350,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pending_rewards
      * @param {AccountId32Like} who
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    pendingRewards: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns the equivalent balance of `points` for a given pool.
@@ -1409,7 +1359,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} points
      **/
-    pointsToBalance: GenericRuntimeApiMethod<Rv, (poolId: number, points: bigint) => Promise<bigint>>;
+    pointsToBalance: GenericRuntimeApiMethod<(poolId: number, points: bigint) => Promise<bigint>>;
 
     /**
      * Returns the equivalent points of `new_funds` for a given pool.
@@ -1418,7 +1368,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} pool_id
      * @param {bigint} new_funds
      **/
-    balanceToPoints: GenericRuntimeApiMethod<Rv, (poolId: number, newFunds: bigint) => Promise<bigint>>;
+    balanceToPoints: GenericRuntimeApiMethod<(poolId: number, newFunds: bigint) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool.
@@ -1426,7 +1376,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_pending_slash
      * @param {number} pool_id
      **/
-    poolPendingSlash: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolPendingSlash: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the pending slash for a given pool member.
@@ -1437,7 +1387,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_pending_slash
      * @param {AccountId32Like} member
      **/
-    memberPendingSlash: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<bigint>>;
+    memberPendingSlash: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Returns true if the pool with `pool_id` needs migration.
@@ -1452,7 +1402,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_needs_delegate_migration
      * @param {number} pool_id
      **/
-    poolNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<boolean>>;
+    poolNeedsDelegateMigration: GenericRuntimeApiMethod<(poolId: number) => Promise<boolean>>;
 
     /**
      * Returns true if the delegated funds of the pool `member` needs migration.
@@ -1466,7 +1416,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_needs_delegate_migration
      * @param {AccountId32Like} member
      **/
-    memberNeedsDelegateMigration: GenericRuntimeApiMethod<Rv, (member: AccountId32Like) => Promise<boolean>>;
+    memberNeedsDelegateMigration: GenericRuntimeApiMethod<(member: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Returns the total contribution of a pool member including any balance that is unbonding.
@@ -1474,7 +1424,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_member_total_balance
      * @param {AccountId32Like} who
      **/
-    memberTotalBalance: GenericRuntimeApiMethod<Rv, (who: AccountId32Like) => Promise<bigint>>;
+    memberTotalBalance: GenericRuntimeApiMethod<(who: AccountId32Like) => Promise<bigint>>;
 
     /**
      * Total balance contributed to the pool.
@@ -1482,7 +1432,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_balance
      * @param {number} pool_id
      **/
-    poolBalance: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<bigint>>;
+    poolBalance: GenericRuntimeApiMethod<(poolId: number) => Promise<bigint>>;
 
     /**
      * Returns the bonded account and reward account associated with the pool_id.
@@ -1490,12 +1440,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: NominationPoolsApi_pool_accounts
      * @param {number} pool_id
      **/
-    poolAccounts: GenericRuntimeApiMethod<Rv, (poolId: number) => Promise<[AccountId32, AccountId32]>>;
+    poolAccounts: GenericRuntimeApiMethod<(poolId: number) => Promise<[AccountId32, AccountId32]>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: StakingApi - 0x18ef58a3b67ba770
@@ -1507,7 +1457,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: StakingApi_nominations_quota
      * @param {bigint} balance
      **/
-    nominationsQuota: GenericRuntimeApiMethod<Rv, (balance: bigint) => Promise<number>>;
+    nominationsQuota: GenericRuntimeApiMethod<(balance: bigint) => Promise<number>>;
 
     /**
      * Returns the page count of exposures for a validator `account` in a given era.
@@ -1516,7 +1466,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    erasStakersPageCount: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<number>>;
+    erasStakersPageCount: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<number>>;
 
     /**
      * Returns true if validator `account` has pages to be claimed for the given era.
@@ -1525,12 +1475,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {number} era
      * @param {AccountId32Like} account
      **/
-    pendingRewards: GenericRuntimeApiMethod<Rv, (era: number, account: AccountId32Like) => Promise<boolean>>;
+    pendingRewards: GenericRuntimeApiMethod<(era: number, account: AccountId32Like) => Promise<boolean>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: GenesisBuilder - 0xfbc577b9d747efd6
@@ -1551,7 +1501,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_build_state
      * @param {BytesLike} json
      **/
-    buildState: GenericRuntimeApiMethod<Rv, (json: BytesLike) => Promise<Result<[], string>>>;
+    buildState: GenericRuntimeApiMethod<(json: BytesLike) => Promise<Result<[], string>>>;
 
     /**
      * Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
@@ -1572,7 +1522,7 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @callname: GenesisBuilder_get_preset
      * @param {string | undefined} id
      **/
-    getPreset: GenericRuntimeApiMethod<Rv, (id?: string | undefined) => Promise<Bytes | undefined>>;
+    getPreset: GenericRuntimeApiMethod<(id?: string | undefined) => Promise<Bytes | undefined>>;
 
     /**
      * Returns a list of identifiers for available builtin `RuntimeGenesisConfig` presets.
@@ -1582,12 +1532,12 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      *
      * @callname: GenesisBuilder_preset_names
      **/
-    presetNames: GenericRuntimeApiMethod<Rv, () => Promise<Array<string>>>;
+    presetNames: GenericRuntimeApiMethod<() => Promise<Array<string>>>;
 
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
   /**
    * @runtimeapi: TrustedQueryApi - 0x2609be83ac4468dc
@@ -1605,7 +1555,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedReserve: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -1624,7 +1573,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
      * @param {XcmVersionedLocation} location
      **/
     isTrustedTeleporter: GenericRuntimeApiMethod<
-      Rv,
       (
         asset: XcmVersionedAsset,
         location: XcmVersionedLocation,
@@ -1634,6 +1582,6 @@ export interface RuntimeApis<Rv extends RpcVersion> extends GenericRuntimeApis<R
     /**
      * Generic runtime api call
      **/
-    [method: string]: GenericRuntimeApiMethod<Rv>;
+    [method: string]: GenericRuntimeApiMethod;
   };
 }
diff --git a/packages/chaintypes/src/westend/tx.d.ts b/packages/chaintypes/src/westend/tx.d.ts
index bbbaa39d..beb67953 100644
--- a/packages/chaintypes/src/westend/tx.d.ts
+++ b/packages/chaintypes/src/westend/tx.d.ts
@@ -3,12 +3,10 @@
 import type {
   GenericChainTx,
   GenericTxCall,
+  GenericChainKnownTypes,
   ISubmittableExtrinsic,
   ISubmittableResult,
   IRuntimeTxCall,
-  RpcVersion,
-  RpcV2,
-  ISubmittableExtrinsicLegacy,
 } from 'dedot/types';
 import type {
   MultiAddressLike,
@@ -103,16 +101,18 @@ import type {
 } from './types.js';
 
 export type ChainSubmittableExtrinsic<
-  Rv extends RpcVersion,
   T extends IRuntimeTxCall = WestendRuntimeRuntimeCallLike,
-> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, any[]> &
-  (Rv extends RpcV2
-    ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
-    : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>);
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> = Extrinsic<MultiAddressLike, T, SpRuntimeMultiSignature, ChainKnownTypes['Extra']> &
+  ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>, ChainKnownTypes['AssetId']>;
 
-export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;
+export type TxCall<ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes> = (
+  ...args: any[]
+) => ChainSubmittableExtrinsic<WestendRuntimeRuntimeCallLike, ChainKnownTypes>;
 
-export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCall<Rv>> {
+export interface ChainTx<
+  ChainKnownTypes extends GenericChainKnownTypes = GenericChainKnownTypes,
+> extends GenericChainTx<TxCall<ChainKnownTypes>> {
   /**
    * Pallet `System`'s transaction calls
    **/
@@ -125,16 +125,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remark: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'Remark';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -144,16 +143,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} pages
      **/
     setHeapPages: GenericTxCall<
-      Rv,
       (pages: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetHeapPages';
             params: { pages: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -163,16 +161,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCode: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCode';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -185,16 +182,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     setCodeWithoutChecks: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetCodeWithoutChecks';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -204,16 +200,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[BytesLike, BytesLike]>} items
      **/
     setStorage: GenericTxCall<
-      Rv,
       (items: Array<[BytesLike, BytesLike]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'SetStorage';
             params: { items: Array<[BytesLike, BytesLike]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -223,16 +218,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<BytesLike>} keys
      **/
     killStorage: GenericTxCall<
-      Rv,
       (keys: Array<BytesLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillStorage';
             params: { keys: Array<BytesLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -246,19 +240,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} subkeys
      **/
     killPrefix: GenericTxCall<
-      Rv,
       (
         prefix: BytesLike,
         subkeys: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'KillPrefix';
             params: { prefix: BytesLike; subkeys: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -268,16 +261,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} remark
      **/
     remarkWithEvent: GenericTxCall<
-      Rv,
       (remark: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'RemarkWithEvent';
             params: { remark: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -290,16 +282,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgrade: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgrade';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -316,16 +307,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} codeHash
      **/
     authorizeUpgradeWithoutChecks: GenericTxCall<
-      Rv,
       (codeHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'AuthorizeUpgradeWithoutChecks';
             params: { codeHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -343,23 +333,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} code
      **/
     applyAuthorizedUpgrade: GenericTxCall<
-      Rv,
       (code: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'System';
           palletCall: {
             name: 'ApplyAuthorizedUpgrade';
             params: { code: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Babe`'s transaction calls
@@ -375,19 +364,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -405,19 +393,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusSlotsEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusSlotsEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -430,23 +417,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpConsensusBabeDigestsNextConfigDescriptor} config
      **/
     planConfigChange: GenericTxCall<
-      Rv,
       (config: SpConsensusBabeDigestsNextConfigDescriptor) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Babe';
           palletCall: {
             name: 'PlanConfigChange';
             params: { config: SpConsensusBabeDigestsNextConfigDescriptor };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Timestamp`'s transaction calls
@@ -476,23 +462,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} now
      **/
     set: GenericTxCall<
-      Rv,
       (now: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Timestamp';
           palletCall: {
             name: 'Set';
             params: { now: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Indices`'s transaction calls
@@ -515,16 +500,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     claim: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Claim';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -546,19 +530,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     transfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Transfer';
             params: { new: MultiAddressLike; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -579,16 +562,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     free: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Free';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -612,20 +594,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} freeze
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         new_: MultiAddressLike,
         index: number,
         freeze: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'ForceTransfer';
             params: { new: MultiAddressLike; index: number; freeze: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -646,16 +627,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     freeze: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'Freeze';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -674,23 +654,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Indices';
           palletCall: {
             name: 'PokeDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Balances`'s transaction calls
@@ -709,19 +688,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferAllowDeath: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAllowDeath';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -734,20 +712,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     forceTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceTransfer';
             params: { source: MultiAddressLike; dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -763,19 +740,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     transferKeepAlive: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         value: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferKeepAlive';
             params: { dest: MultiAddressLike; value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -800,19 +776,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     transferAll: GenericTxCall<
-      Rv,
       (
         dest: MultiAddressLike,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'TransferAll';
             params: { dest: MultiAddressLike; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -825,19 +800,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     forceUnreserve: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceUnreserve';
             params: { who: MultiAddressLike; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -854,16 +828,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} who
      **/
     upgradeAccounts: GenericTxCall<
-      Rv,
       (who: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'UpgradeAccounts';
             params: { who: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -876,19 +849,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} newFree
      **/
     forceSetBalance: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         newFree: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceSetBalance';
             params: { who: MultiAddressLike; newFree: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -903,19 +875,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} delta
      **/
     forceAdjustTotalIssuance: GenericTxCall<
-      Rv,
       (
         direction: PalletBalancesAdjustmentDirection,
         delta: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'ForceAdjustTotalIssuance';
             params: { direction: PalletBalancesAdjustmentDirection; delta: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -932,26 +903,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} keepAlive
      **/
     burn: GenericTxCall<
-      Rv,
       (
         value: bigint,
         keepAlive: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Balances';
           palletCall: {
             name: 'Burn';
             params: { value: bigint; keepAlive: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Staking`'s transaction calls
@@ -979,19 +949,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     bond: GenericTxCall<
-      Rv,
       (
         value: bigint,
         payee: PalletStakingRewardDestination,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Bond';
             params: { value: bigint; payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1014,16 +983,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxAdditional
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (maxAdditional: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'BondExtra';
             params: { maxAdditional: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1053,16 +1021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     unbond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Unbond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1094,16 +1061,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (numSlashingSpans: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1117,16 +1083,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingValidatorPrefs} prefs
      **/
     validate: GenericTxCall<
-      Rv,
       (prefs: PalletStakingValidatorPrefs) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Validate';
             params: { prefs: PalletStakingValidatorPrefs };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1145,16 +1110,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} targets
      **/
     nominate: GenericTxCall<
-      Rv,
       (targets: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Nominate';
             params: { targets: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1172,15 +1136,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     chill: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Chill';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1201,16 +1164,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingRewardDestination} payee
      **/
     setPayee: GenericTxCall<
-      Rv,
       (payee: PalletStakingRewardDestination) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetPayee';
             params: { payee: PalletStakingRewardDestination };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1232,15 +1194,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     setController: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetController';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1255,16 +1216,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidatorCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetValidatorCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1280,16 +1240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} additional
      **/
     increaseValidatorCount: GenericTxCall<
-      Rv,
       (additional: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'IncreaseValidatorCount';
             params: { additional: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1305,16 +1264,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Percent} factor
      **/
     scaleValidatorCount: GenericTxCall<
-      Rv,
       (factor: Percent) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ScaleValidatorCount';
             params: { factor: Percent };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1335,15 +1293,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNoEras: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNoEras';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1365,15 +1322,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEra: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEra';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1385,16 +1341,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} invulnerables
      **/
     setInvulnerables: GenericTxCall<
-      Rv,
       (invulnerables: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetInvulnerables';
             params: { invulnerables: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1412,19 +1367,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     forceUnstake: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceUnstake';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1441,15 +1395,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceNewEraAlways: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceNewEraAlways';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1465,19 +1418,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<number>} slashIndices
      **/
     cancelDeferredSlash: GenericTxCall<
-      Rv,
       (
         era: number,
         slashIndices: Array<number>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'CancelDeferredSlash';
             params: { era: number; slashIndices: Array<number> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1500,19 +1452,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} era
      **/
     payoutStakers: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakers';
             params: { validatorStash: AccountId32Like; era: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1528,16 +1479,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} value
      **/
     rebond: GenericTxCall<
-      Rv,
       (value: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Rebond';
             params: { value: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1565,19 +1515,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     reapStash: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ReapStash';
             params: { stash: AccountId32Like; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1597,16 +1546,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<MultiAddressLike>} who
      **/
     kick: GenericTxCall<
-      Rv,
       (who: Array<MultiAddressLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'Kick';
             params: { who: Array<MultiAddressLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1638,7 +1586,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingPalletConfigOpPercent} maxStakedRewards
      **/
     setStakingConfigs: GenericTxCall<
-      Rv,
       (
         minNominatorBond: PalletStakingPalletConfigOp,
         minValidatorBond: PalletStakingPalletConfigOp,
@@ -1648,7 +1595,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         minCommission: PalletStakingPalletConfigOpPerbill,
         maxStakedRewards: PalletStakingPalletConfigOpPercent,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -1663,7 +1609,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxStakedRewards: PalletStakingPalletConfigOpPercent;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1698,16 +1645,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     chillOther: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ChillOther';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1719,16 +1665,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} validatorStash
      **/
     forceApplyMinCommission: GenericTxCall<
-      Rv,
       (validatorStash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ForceApplyMinCommission';
             params: { validatorStash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1741,16 +1686,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setMinCommission: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'SetMinCommission';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1778,20 +1722,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} page
      **/
     payoutStakersByPage: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         page: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'PayoutStakersByPage';
             params: { validatorStash: AccountId32Like; era: number; page: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1806,16 +1749,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} controller
      **/
     updatePayee: GenericTxCall<
-      Rv,
       (controller: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'UpdatePayee';
             params: { controller: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1831,16 +1773,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} controllers
      **/
     deprecateControllerBatch: GenericTxCall<
-      Rv,
       (controllers: Array<AccountId32Like>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'DeprecateControllerBatch';
             params: { controllers: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1863,14 +1804,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<PalletStakingUnlockChunk> | undefined} maybeUnlocking
      **/
     restoreLedger: GenericTxCall<
-      Rv,
       (
         stash: AccountId32Like,
         maybeController: AccountId32Like | undefined,
         maybeTotal: bigint | undefined,
         maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
@@ -1882,7 +1821,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeUnlocking: Array<PalletStakingUnlockChunk> | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1898,16 +1838,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} stash
      **/
     migrateCurrency: GenericTxCall<
-      Rv,
       (stash: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'MigrateCurrency';
             params: { stash: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -1939,27 +1878,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} slashFraction
      **/
     manualSlash: GenericTxCall<
-      Rv,
       (
         validatorStash: AccountId32Like,
         era: number,
         slashFraction: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Staking';
           palletCall: {
             name: 'ManualSlash';
             params: { validatorStash: AccountId32Like; era: number; slashFraction: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Parameters`'s transaction calls
@@ -1974,23 +1912,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeParameters} keyValue
      **/
     setParameter: GenericTxCall<
-      Rv,
       (keyValue: WestendRuntimeRuntimeParameters) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Parameters';
           palletCall: {
             name: 'SetParameter';
             params: { keyValue: WestendRuntimeRuntimeParameters };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Session`'s transaction calls
@@ -2011,19 +1948,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} proof
      **/
     setKeys: GenericTxCall<
-      Rv,
       (
         keys: WestendRuntimeSessionKeys,
         proof: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'SetKeys';
             params: { keys: WestendRuntimeSessionKeys; proof: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2043,22 +1979,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     purgeKeys: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Session';
           palletCall: {
             name: 'PurgeKeys';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Grandpa`'s transaction calls
@@ -2074,19 +2009,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocation: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocation';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2105,19 +2039,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportEquivocationUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusGrandpaEquivocationProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'ReportEquivocationUnsigned';
             params: { equivocationProof: SpConsensusGrandpaEquivocationProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2139,26 +2072,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} bestFinalizedBlockNumber
      **/
     noteStalled: GenericTxCall<
-      Rv,
       (
         delay: number,
         bestFinalizedBlockNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Grandpa';
           palletCall: {
             name: 'NoteStalled';
             params: { delay: number; bestFinalizedBlockNumber: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Utility`'s transaction calls
@@ -2187,16 +2119,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<WestendRuntimeRuntimeCallLike>} calls
      **/
     batch: GenericTxCall<
-      Rv,
       (calls: Array<WestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'Batch';
             params: { calls: Array<WestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2219,19 +2150,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     asDerivative: GenericTxCall<
-      Rv,
       (
         index: number,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'AsDerivative';
             params: { index: number; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2253,16 +2183,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<WestendRuntimeRuntimeCallLike>} calls
      **/
     batchAll: GenericTxCall<
-      Rv,
       (calls: Array<WestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'BatchAll';
             params: { calls: Array<WestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2278,19 +2207,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     dispatchAs: GenericTxCall<
-      Rv,
       (
         asOrigin: WestendRuntimeOriginCaller,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAs';
             params: { asOrigin: WestendRuntimeOriginCaller; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2312,16 +2240,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<WestendRuntimeRuntimeCallLike>} calls
      **/
     forceBatch: GenericTxCall<
-      Rv,
       (calls: Array<WestendRuntimeRuntimeCallLike>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'ForceBatch';
             params: { calls: Array<WestendRuntimeRuntimeCallLike> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2337,19 +2264,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     withWeight: GenericTxCall<
-      Rv,
       (
         call: WestendRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'WithWeight';
             params: { call: WestendRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2382,19 +2308,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} fallback
      **/
     ifElse: GenericTxCall<
-      Rv,
       (
         main: WestendRuntimeRuntimeCallLike,
         fallback: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'IfElse';
             params: { main: WestendRuntimeRuntimeCallLike; fallback: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2409,26 +2334,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     dispatchAsFallible: GenericTxCall<
-      Rv,
       (
         asOrigin: WestendRuntimeOriginCaller,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Utility';
           palletCall: {
             name: 'DispatchAsFallible';
             params: { asOrigin: WestendRuntimeOriginCaller; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Identity`'s transaction calls
@@ -2446,16 +2370,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     addRegistrar: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddRegistrar';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2474,16 +2397,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletIdentityLegacyIdentityInfo} info
      **/
     setIdentity: GenericTxCall<
-      Rv,
       (info: PalletIdentityLegacyIdentityInfo) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetIdentity';
             params: { info: PalletIdentityLegacyIdentityInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2501,16 +2423,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, Data]>} subs
      **/
     setSubs: GenericTxCall<
-      Rv,
       (subs: Array<[AccountId32Like, Data]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetSubs';
             params: { subs: Array<[AccountId32Like, Data]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2526,15 +2447,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     clearIdentity: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ClearIdentity';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2560,19 +2480,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} maxFee
      **/
     requestJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         maxFee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RequestJudgement';
             params: { regIndex: number; maxFee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2591,16 +2510,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} regIndex
      **/
     cancelRequest: GenericTxCall<
-      Rv,
       (regIndex: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'CancelRequest';
             params: { regIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2617,19 +2535,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fee
      **/
     setFee: GenericTxCall<
-      Rv,
       (
         index: number,
         fee: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFee';
             params: { index: number; fee: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2646,19 +2563,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setAccountId: GenericTxCall<
-      Rv,
       (
         index: number,
         new_: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetAccountId';
             params: { index: number; new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2675,19 +2591,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} fields
      **/
     setFields: GenericTxCall<
-      Rv,
       (
         index: number,
         fields: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetFields';
             params: { index: number; fields: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2714,21 +2629,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} identity
      **/
     provideJudgement: GenericTxCall<
-      Rv,
       (
         regIndex: number,
         target: MultiAddressLike,
         judgement: PalletIdentityJudgement,
         identity: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'ProvideJudgement';
             params: { regIndex: number; target: MultiAddressLike; judgement: PalletIdentityJudgement; identity: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2749,16 +2663,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     killIdentity: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillIdentity';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2775,19 +2688,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     addSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2801,19 +2713,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Data} data
      **/
     renameSub: GenericTxCall<
-      Rv,
       (
         sub: MultiAddressLike,
         data: Data,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RenameSub';
             params: { sub: MultiAddressLike; data: Data };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2829,16 +2740,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} sub
      **/
     removeSub: GenericTxCall<
-      Rv,
       (sub: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveSub';
             params: { sub: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2856,15 +2766,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     quitSub: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'QuitSub';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2880,20 +2789,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} allocation
      **/
     addUsernameAuthority: GenericTxCall<
-      Rv,
       (
         authority: MultiAddressLike,
         suffix: BytesLike,
         allocation: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AddUsernameAuthority';
             params: { authority: MultiAddressLike; suffix: BytesLike; allocation: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2904,19 +2812,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} authority
      **/
     removeUsernameAuthority: GenericTxCall<
-      Rv,
       (
         suffix: BytesLike,
         authority: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsernameAuthority';
             params: { suffix: BytesLike; authority: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2941,14 +2848,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} useAllocation
      **/
     setUsernameFor: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         username: BytesLike,
         signature: SpRuntimeMultiSignature | undefined,
         useAllocation: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
@@ -2960,7 +2865,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               useAllocation: boolean;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2971,16 +2877,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     acceptUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'AcceptUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -2992,16 +2897,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeExpiredApproval: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveExpiredApproval';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3011,16 +2915,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     setPrimaryUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'SetPrimaryUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3032,16 +2935,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     unbindUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'UnbindUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3052,16 +2954,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     removeUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'RemoveUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3072,23 +2973,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} username
      **/
     killUsername: GenericTxCall<
-      Rv,
       (username: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Identity';
           palletCall: {
             name: 'KillUsername';
             params: { username: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Recovery`'s transaction calls
@@ -3108,19 +3008,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     asRecovered: GenericTxCall<
-      Rv,
       (
         account: MultiAddressLike,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'AsRecovered';
             params: { account: MultiAddressLike; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3138,19 +3037,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     setRecovered: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'SetRecovered';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3177,20 +3075,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayPeriod
      **/
     createRecovery: GenericTxCall<
-      Rv,
       (
         friends: Array<AccountId32Like>,
         threshold: number,
         delayPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CreateRecovery';
             params: { friends: Array<AccountId32Like>; threshold: number; delayPeriod: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3210,16 +3107,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     initiateRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'InitiateRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3241,19 +3137,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     vouchRecovery: GenericTxCall<
-      Rv,
       (
         lost: MultiAddressLike,
         rescuer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'VouchRecovery';
             params: { lost: MultiAddressLike; rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3271,16 +3166,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     claimRecovery: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'ClaimRecovery';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3300,16 +3194,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} rescuer
      **/
     closeRecovery: GenericTxCall<
-      Rv,
       (rescuer: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CloseRecovery';
             params: { rescuer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3328,15 +3221,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeRecovery: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'RemoveRecovery';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3352,16 +3244,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} account
      **/
     cancelRecovered: GenericTxCall<
-      Rv,
       (account: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'CancelRecovered';
             params: { account: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3393,23 +3284,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike | undefined} maybeAccount
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (maybeAccount: MultiAddressLike | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Recovery';
           palletCall: {
             name: 'PokeDeposit';
             params: { maybeAccount: MultiAddressLike | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Vesting`'s transaction calls
@@ -3428,15 +3318,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     vest: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'Vest';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3456,16 +3345,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     vestOther: GenericTxCall<
-      Rv,
       (target: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestOther';
             params: { target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3488,19 +3376,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     vestedTransfer: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'VestedTransfer';
             params: { target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3525,20 +3412,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletVestingVestingInfo} schedule
      **/
     forceVestedTransfer: GenericTxCall<
-      Rv,
       (
         source: MultiAddressLike,
         target: MultiAddressLike,
         schedule: PalletVestingVestingInfo,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceVestedTransfer';
             params: { source: MultiAddressLike; target: MultiAddressLike; schedule: PalletVestingVestingInfo };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3569,19 +3455,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} schedule2Index
      **/
     mergeSchedules: GenericTxCall<
-      Rv,
       (
         schedule1Index: number,
         schedule2Index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'MergeSchedules';
             params: { schedule1Index: number; schedule2Index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3597,26 +3482,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} scheduleIndex
      **/
     forceRemoveVestingSchedule: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         scheduleIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Vesting';
           palletCall: {
             name: 'ForceRemoveVestingSchedule';
             params: { target: MultiAddressLike; scheduleIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Scheduler`'s transaction calls
@@ -3631,14 +3515,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     schedule: GenericTxCall<
-      Rv,
       (
         when: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3650,7 +3532,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3661,19 +3544,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (
         when: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'Cancel';
             params: { when: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3687,7 +3569,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     scheduleNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         when: number,
@@ -3695,7 +3576,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3708,7 +3588,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3718,16 +3599,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3740,14 +3620,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     scheduleAfter: GenericTxCall<
-      Rv,
       (
         after: number,
         maybePeriodic: [number, number] | undefined,
         priority: number,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3759,7 +3637,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3773,7 +3652,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     scheduleNamedAfter: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         after: number,
@@ -3781,7 +3659,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         priority: number,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
@@ -3794,7 +3671,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3817,20 +3695,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetry: GenericTxCall<
-      Rv,
       (
         task: [number, number],
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetry';
             params: { task: [number, number]; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3853,20 +3730,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} period
      **/
     setRetryNamed: GenericTxCall<
-      Rv,
       (
         id: FixedBytes<32>,
         retries: number,
         period: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'SetRetryNamed';
             params: { id: FixedBytes<32>; retries: number; period: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3876,16 +3752,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[number, number]} task
      **/
     cancelRetry: GenericTxCall<
-      Rv,
       (task: [number, number]) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetry';
             params: { task: [number, number] };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3895,23 +3770,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} id
      **/
     cancelRetryNamed: GenericTxCall<
-      Rv,
       (id: FixedBytes<32>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Scheduler';
           palletCall: {
             name: 'CancelRetryNamed';
             params: { id: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Preimage`'s transaction calls
@@ -3926,16 +3800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} bytes
      **/
     notePreimage: GenericTxCall<
-      Rv,
       (bytes: BytesLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'NotePreimage';
             params: { bytes: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3950,16 +3823,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unnotePreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnnotePreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3972,16 +3844,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     requestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'RequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -3993,16 +3864,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} hash
      **/
     unrequestPreimage: GenericTxCall<
-      Rv,
       (hash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'UnrequestPreimage';
             params: { hash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4014,23 +3884,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<H256>} hashes
      **/
     ensureUpdated: GenericTxCall<
-      Rv,
       (hashes: Array<H256>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Preimage';
           palletCall: {
             name: 'EnsureUpdated';
             params: { hashes: Array<H256> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Sudo`'s transaction calls
@@ -4042,16 +3911,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     sudo: GenericTxCall<
-      Rv,
       (call: WestendRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'Sudo';
             params: { call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4066,19 +3934,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weight
      **/
     sudoUncheckedWeight: GenericTxCall<
-      Rv,
       (
         call: WestendRuntimeRuntimeCallLike,
         weight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoUncheckedWeight';
             params: { call: WestendRuntimeRuntimeCallLike; weight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4089,16 +3956,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} new_
      **/
     setKey: GenericTxCall<
-      Rv,
       (new_: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SetKey';
             params: { new: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4112,19 +3978,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     sudoAs: GenericTxCall<
-      Rv,
       (
         who: MultiAddressLike,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'SudoAs';
             params: { who: MultiAddressLike; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4135,22 +4000,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeKey: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Sudo';
           palletCall: {
             name: 'RemoveKey';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Proxy`'s transaction calls
@@ -4172,13 +4036,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     proxy: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         forceProxyType: WestendRuntimeProxyType | undefined,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4189,7 +4051,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4209,20 +4072,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     addProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: WestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'AddProxy';
             params: { delegate: MultiAddressLike; proxyType: WestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4240,20 +4102,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delay
      **/
     removeProxy: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         proxyType: WestendRuntimeProxyType,
         delay: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxy';
             params: { delegate: MultiAddressLike; proxyType: WestendRuntimeProxyType; delay: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4267,15 +4128,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeProxies: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveProxies';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4304,20 +4164,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     createPure: GenericTxCall<
-      Rv,
       (
         proxyType: WestendRuntimeProxyType,
         delay: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'CreatePure';
             params: { proxyType: WestendRuntimeProxyType; delay: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4346,7 +4205,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} extIndex
      **/
     killPure: GenericTxCall<
-      Rv,
       (
         spawner: MultiAddressLike,
         proxyType: WestendRuntimeProxyType,
@@ -4354,7 +4212,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         height: number,
         extIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4367,7 +4224,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               extIndex: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4392,19 +4250,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     announce: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'Announce';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4424,19 +4281,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeAnnouncement: GenericTxCall<
-      Rv,
       (
         real: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RemoveAnnouncement';
             params: { real: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4456,19 +4312,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     rejectAnnouncement: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         callHash: H256,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'RejectAnnouncement';
             params: { delegate: MultiAddressLike; callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4491,14 +4346,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     proxyAnnounced: GenericTxCall<
-      Rv,
       (
         delegate: MultiAddressLike,
         real: MultiAddressLike,
         forceProxyType: WestendRuntimeProxyType | undefined,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
@@ -4510,7 +4363,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               call: WestendRuntimeRuntimeCallLike;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4526,22 +4380,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Proxy';
           palletCall: {
             name: 'PokeDeposit';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Multisig`'s transaction calls
@@ -4565,19 +4418,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     asMultiThreshold1: GenericTxCall<
-      Rv,
       (
         otherSignatories: Array<AccountId32Like>,
         call: WestendRuntimeRuntimeCallLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'AsMultiThreshold1';
             params: { otherSignatories: Array<AccountId32Like>; call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4629,7 +4481,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     asMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4637,7 +4488,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         call: WestendRuntimeRuntimeCallLike,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4650,7 +4500,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4693,7 +4544,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     approveAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
@@ -4701,7 +4551,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         callHash: FixedBytes<32>,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4714,7 +4563,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxWeight: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4747,14 +4597,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     cancelAsMulti: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         timepoint: PalletMultisigTimepoint,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
@@ -4766,7 +4614,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               callHash: FixedBytes<32>;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4790,27 +4639,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedBytes<32>} callHash
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (
         threshold: number,
         otherSignatories: Array<AccountId32Like>,
         callHash: FixedBytes<32>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Multisig';
           palletCall: {
             name: 'PokeDeposit';
             params: { threshold: number; otherSignatories: Array<AccountId32Like>; callHash: FixedBytes<32> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s transaction calls
@@ -4836,12 +4684,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseSolutionOrSnapshotSize} witness
      **/
     submitUnsigned: GenericTxCall<
-      Rv,
       (
         rawSolution: PalletElectionProviderMultiPhaseRawSolution,
         witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
@@ -4851,7 +4697,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               witness: PalletElectionProviderMultiPhaseSolutionOrSnapshotSize;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4865,16 +4712,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpNposElectionsElectionScore | undefined} maybeNextScore
      **/
     setMinimumUntrustedScore: GenericTxCall<
-      Rv,
       (maybeNextScore: SpNposElectionsElectionScore | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetMinimumUntrustedScore';
             params: { maybeNextScore: SpNposElectionsElectionScore | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4891,16 +4737,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[AccountId32Like, SpNposElectionsSupport]>} supports
      **/
     setEmergencyElectionResult: GenericTxCall<
-      Rv,
       (supports: Array<[AccountId32Like, SpNposElectionsSupport]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'SetEmergencyElectionResult';
             params: { supports: Array<[AccountId32Like, SpNposElectionsSupport]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4918,16 +4763,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletElectionProviderMultiPhaseRawSolution} rawSolution
      **/
     submit: GenericTxCall<
-      Rv,
       (rawSolution: PalletElectionProviderMultiPhaseRawSolution) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'Submit';
             params: { rawSolution: PalletElectionProviderMultiPhaseRawSolution };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -4939,22 +4783,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     governanceFallback: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ElectionProviderMultiPhase';
           palletCall: {
             name: 'GovernanceFallback';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `VoterList`'s transaction calls
@@ -4975,16 +4818,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} dislocated
      **/
     rebag: GenericTxCall<
-      Rv,
       (dislocated: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'Rebag';
             params: { dislocated: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5003,16 +4845,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOf: GenericTxCall<
-      Rv,
       (lighter: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOf';
             params: { lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5025,26 +4866,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} lighter
      **/
     putInFrontOfOther: GenericTxCall<
-      Rv,
       (
         heavier: MultiAddressLike,
         lighter: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'VoterList';
           palletCall: {
             name: 'PutInFrontOfOther';
             params: { heavier: MultiAddressLike; lighter: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `NominationPools`'s transaction calls
@@ -5072,19 +4912,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     join: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Join';
             params: { amount: bigint; poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5100,16 +4939,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtra: GenericTxCall<
-      Rv,
       (extra: PalletNominationPoolsBondExtra) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtra';
             params: { extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5125,15 +4963,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     claimPayout: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayout';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5174,19 +5011,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} unbondingPoints
      **/
     unbond: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         unbondingPoints: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Unbond';
             params: { memberAccount: MultiAddressLike; unbondingPoints: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5202,19 +5038,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     poolWithdrawUnbonded: GenericTxCall<
-      Rv,
       (
         poolId: number,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'PoolWithdrawUnbonded';
             params: { poolId: number; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5246,19 +5081,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numSlashingSpans
      **/
     withdrawUnbonded: GenericTxCall<
-      Rv,
       (
         memberAccount: MultiAddressLike,
         numSlashingSpans: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'WithdrawUnbonded';
             params: { memberAccount: MultiAddressLike; numSlashingSpans: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5287,21 +5121,20 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} bouncer
      **/
     create: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
         nominator: MultiAddressLike,
         bouncer: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Create';
             params: { amount: bigint; root: MultiAddressLike; nominator: MultiAddressLike; bouncer: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5320,7 +5153,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     createWithPoolId: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         root: MultiAddressLike,
@@ -5328,7 +5160,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         bouncer: MultiAddressLike,
         poolId: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -5341,7 +5172,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               poolId: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5363,19 +5195,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<AccountId32Like>} validators
      **/
     nominate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         validators: Array<AccountId32Like>,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Nominate';
             params: { poolId: number; validators: Array<AccountId32Like> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5395,19 +5226,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsPoolState} state
      **/
     setState: GenericTxCall<
-      Rv,
       (
         poolId: number,
         state: PalletNominationPoolsPoolState,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetState';
             params: { poolId: number; state: PalletNominationPoolsPoolState };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5421,19 +5251,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} metadata
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         poolId: number,
         metadata: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetMetadata';
             params: { poolId: number; metadata: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5458,7 +5287,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOpPerbill} globalMaxCommission
      **/
     setConfigs: GenericTxCall<
-      Rv,
       (
         minJoinBond: PalletNominationPoolsConfigOp,
         minCreateBond: PalletNominationPoolsConfigOp,
@@ -5467,7 +5295,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         maxMembersPerPool: PalletNominationPoolsConfigOpU32,
         globalMaxCommission: PalletNominationPoolsConfigOpPerbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -5481,7 +5308,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               globalMaxCommission: PalletNominationPoolsConfigOpPerbill;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5500,14 +5328,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsConfigOp004} newBouncer
      **/
     updateRoles: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newRoot: PalletNominationPoolsConfigOp004,
         newNominator: PalletNominationPoolsConfigOp004,
         newBouncer: PalletNominationPoolsConfigOp004,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
@@ -5519,7 +5345,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newBouncer: PalletNominationPoolsConfigOp004;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5545,16 +5372,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     chill: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'Chill';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5573,19 +5399,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsBondExtra} extra
      **/
     bondExtraOther: GenericTxCall<
-      Rv,
       (
         member: MultiAddressLike,
         extra: PalletNominationPoolsBondExtra,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'BondExtraOther';
             params: { member: MultiAddressLike; extra: PalletNominationPoolsBondExtra };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5601,16 +5426,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsClaimPermission} permission
      **/
     setClaimPermission: GenericTxCall<
-      Rv,
       (permission: PalletNominationPoolsClaimPermission) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetClaimPermission';
             params: { permission: PalletNominationPoolsClaimPermission };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5623,16 +5447,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} other
      **/
     claimPayoutOther: GenericTxCall<
-      Rv,
       (other: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimPayoutOther';
             params: { other: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5647,19 +5470,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {[Perbill, AccountId32Like] | undefined} newCommission
      **/
     setCommission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         newCommission: [Perbill, AccountId32Like] | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommission';
             params: { poolId: number; newCommission: [Perbill, AccountId32Like] | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5674,19 +5496,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} maxCommission
      **/
     setCommissionMax: GenericTxCall<
-      Rv,
       (
         poolId: number,
         maxCommission: Perbill,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionMax';
             params: { poolId: number; maxCommission: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5700,19 +5521,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionChangeRate} changeRate
      **/
     setCommissionChangeRate: GenericTxCall<
-      Rv,
       (
         poolId: number,
         changeRate: PalletNominationPoolsCommissionChangeRate,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionChangeRate';
             params: { poolId: number; changeRate: PalletNominationPoolsCommissionChangeRate };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5737,16 +5557,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     claimCommission: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ClaimCommission';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5762,16 +5581,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     adjustPoolDeposit: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'AdjustPoolDeposit';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5785,19 +5603,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletNominationPoolsCommissionClaimPermission | undefined} permission
      **/
     setCommissionClaimPermission: GenericTxCall<
-      Rv,
       (
         poolId: number,
         permission: PalletNominationPoolsCommissionClaimPermission | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'SetCommissionClaimPermission';
             params: { poolId: number; permission: PalletNominationPoolsCommissionClaimPermission | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5815,16 +5632,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     applySlash: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'ApplySlash';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5842,16 +5658,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} memberAccount
      **/
     migrateDelegation: GenericTxCall<
-      Rv,
       (memberAccount: MultiAddressLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigrateDelegation';
             params: { memberAccount: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5869,23 +5684,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} poolId
      **/
     migratePoolToDelegateStake: GenericTxCall<
-      Rv,
       (poolId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'NominationPools';
           palletCall: {
             name: 'MigratePoolToDelegateStake';
             params: { poolId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `FastUnstake`'s transaction calls
@@ -5921,15 +5735,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     registerFastUnstake: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'RegisterFastUnstake';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5955,15 +5768,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     deregister: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Deregister';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -5985,23 +5797,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} erasToCheck
      **/
     control: GenericTxCall<
-      Rv,
       (erasToCheck: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'FastUnstake';
           palletCall: {
             name: 'Control';
             params: { erasToCheck: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ConvictionVoting`'s transaction calls
@@ -6022,19 +5833,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletConvictionVotingVoteAccountVote} vote
      **/
     vote: GenericTxCall<
-      Rv,
       (
         pollIndex: number,
         vote: PalletConvictionVotingVoteAccountVote,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Vote';
             params: { pollIndex: number; vote: PalletConvictionVotingVoteAccountVote };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6069,14 +5879,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} balance
      **/
     delegate: GenericTxCall<
-      Rv,
       (
         class_: number,
         to: MultiAddressLike,
         conviction: PalletConvictionVotingConviction,
         balance: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
@@ -6088,7 +5896,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               balance: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6111,16 +5920,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} class_
      **/
     undelegate: GenericTxCall<
-      Rv,
       (class_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Undelegate';
             params: { class: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6139,19 +5947,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} target
      **/
     unlock: GenericTxCall<
-      Rv,
       (
         class_: number,
         target: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'Unlock';
             params: { class: number; target: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6190,19 +5997,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeVote: GenericTxCall<
-      Rv,
       (
         class_: number | undefined,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveVote';
             params: { class: number | undefined; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6229,27 +6035,26 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     removeOtherVote: GenericTxCall<
-      Rv,
       (
         target: MultiAddressLike,
         class_: number,
         index: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ConvictionVoting';
           palletCall: {
             name: 'RemoveOtherVote';
             params: { target: MultiAddressLike; class: number; index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Referenda`'s transaction calls
@@ -6271,13 +6076,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FrameSupportScheduleDispatchTime} enactmentMoment
      **/
     submit: GenericTxCall<
-      Rv,
       (
         proposalOrigin: WestendRuntimeOriginCaller,
         proposal: FrameSupportPreimagesBounded,
         enactmentMoment: FrameSupportScheduleDispatchTime,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
@@ -6288,7 +6091,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               enactmentMoment: FrameSupportScheduleDispatchTime;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6305,16 +6109,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     placeDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'PlaceDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6330,16 +6133,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundDecisionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundDecisionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6354,16 +6156,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     cancel: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Cancel';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6378,16 +6179,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     kill: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'Kill';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6400,16 +6200,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     nudgeReferendum: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'NudgeReferendum';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6427,16 +6226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} track
      **/
     oneFewerDeciding: GenericTxCall<
-      Rv,
       (track: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'OneFewerDeciding';
             params: { track: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6452,16 +6250,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     refundSubmissionDeposit: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'RefundSubmissionDeposit';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6478,26 +6275,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256 | undefined} maybeHash
      **/
     setMetadata: GenericTxCall<
-      Rv,
       (
         index: number,
         maybeHash: H256 | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Referenda';
           palletCall: {
             name: 'SetMetadata';
             params: { index: number; maybeHash: H256 | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Whitelist`'s transaction calls
@@ -6508,16 +6304,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     whitelistCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'WhitelistCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6526,16 +6321,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {H256} callHash
      **/
     removeWhitelistedCall: GenericTxCall<
-      Rv,
       (callHash: H256) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'RemoveWhitelistedCall';
             params: { callHash: H256 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6546,20 +6340,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} callWeightWitness
      **/
     dispatchWhitelistedCall: GenericTxCall<
-      Rv,
       (
         callHash: H256,
         callEncodedLen: number,
         callWeightWitness: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCall';
             params: { callHash: H256; callEncodedLen: number; callWeightWitness: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6568,23 +6361,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {WestendRuntimeRuntimeCallLike} call
      **/
     dispatchWhitelistedCallWithPreimage: GenericTxCall<
-      Rv,
       (call: WestendRuntimeRuntimeCallLike) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Whitelist';
           palletCall: {
             name: 'DispatchWhitelistedCallWithPreimage';
             params: { call: WestendRuntimeRuntimeCallLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Treasury`'s transaction calls
@@ -6613,19 +6405,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {MultiAddressLike} beneficiary
      **/
     spendLocal: GenericTxCall<
-      Rv,
       (
         amount: bigint,
         beneficiary: MultiAddressLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'SpendLocal';
             params: { amount: bigint; beneficiary: MultiAddressLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6655,16 +6446,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposalId
      **/
     removeApproval: GenericTxCall<
-      Rv,
       (proposalId: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'RemoveApproval';
             params: { proposalId: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6702,14 +6492,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} validFrom
      **/
     spend: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         amount: bigint,
         beneficiary: XcmVersionedLocation,
         validFrom: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
@@ -6721,7 +6509,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validFrom: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6751,16 +6540,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `spend_local` call will be removed by May 2025. Migrate to the new flow and use the `spend` call.
      **/
     payout: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'Payout';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6790,16 +6578,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated The `remove_approval` call will be removed by May 2025. It associated with the deprecated `spend_local` call.
      **/
     checkStatus: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'CheckStatus';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6824,23 +6611,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} index
      **/
     voidSpend: GenericTxCall<
-      Rv,
       (index: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Treasury';
           palletCall: {
             name: 'VoidSpend';
             params: { index: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Configuration`'s transaction calls
@@ -6852,16 +6638,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeCooldown: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeCooldown';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6871,16 +6656,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6890,16 +6674,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCodeRetentionPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCodeRetentionPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6909,16 +6692,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxCodeSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxCodeSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6928,16 +6710,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxPovSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxPovSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6947,16 +6728,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxHeadDataSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxHeadDataSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6969,16 +6749,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setCoretimeCores: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetCoretimeCores';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -6988,16 +6767,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setGroupRotationFrequency: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetGroupRotationFrequency';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7007,16 +6785,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setParasAvailabilityPeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetParasAvailabilityPeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7026,16 +6803,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setSchedulingLookahead: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulingLookahead';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7045,16 +6821,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidatorsPerCore: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidatorsPerCore';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7064,16 +6839,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} new_
      **/
     setMaxValidators: GenericTxCall<
-      Rv,
       (new_: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxValidators';
             params: { new: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7083,16 +6857,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7102,16 +6875,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setDisputePostConclusionAcceptancePeriod: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetDisputePostConclusionAcceptancePeriod';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7122,16 +6894,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNoShowSlots: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNoShowSlots';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7141,16 +6912,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNDelayTranches: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNDelayTranches';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7160,16 +6930,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setZerothDelayTrancheWidth: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetZerothDelayTrancheWidth';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7179,16 +6948,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setNeededApprovals: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNeededApprovals';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7198,16 +6966,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setRelayVrfModuloSamples: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetRelayVrfModuloSamples';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7217,16 +6984,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueCount: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueCount';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7237,16 +7003,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardQueueSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardQueueSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7256,16 +7021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxDownwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxDownwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7275,16 +7039,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7294,16 +7057,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMaxUpwardMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMaxUpwardMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7313,16 +7075,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpOpenRequestTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpOpenRequestTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7332,16 +7093,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpSenderDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpSenderDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7352,16 +7112,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setHrmpRecipientDeposit: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpRecipientDeposit';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7371,16 +7130,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxCapacity: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxCapacity';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7390,16 +7148,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxTotalSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxTotalSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7409,16 +7166,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainInboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainInboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7428,16 +7184,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpChannelMaxMessageSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpChannelMaxMessageSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7447,16 +7202,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxParachainOutboundChannels: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxParachainOutboundChannels';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7466,16 +7220,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setHrmpMaxMessageNumPerCandidate: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetHrmpMaxMessageNumPerCandidate';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7485,16 +7238,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setPvfVotingTtl: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetPvfVotingTtl';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7507,16 +7259,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumValidationUpgradeDelay: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumValidationUpgradeDelay';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7527,16 +7278,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} new_
      **/
     setBypassConsistencyCheck: GenericTxCall<
-      Rv,
       (new_: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetBypassConsistencyCheck';
             params: { new: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7546,16 +7296,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8AsyncBackingAsyncBackingParams} new_
      **/
     setAsyncBackingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetAsyncBackingParams';
             params: { new: PolkadotPrimitivesV8AsyncBackingAsyncBackingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7565,16 +7314,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ExecutorParams} new_
      **/
     setExecutorParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ExecutorParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetExecutorParams';
             params: { new: PolkadotPrimitivesV8ExecutorParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7584,16 +7332,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} new_
      **/
     setOnDemandBaseFee: GenericTxCall<
-      Rv,
       (new_: bigint) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandBaseFee';
             params: { new: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7603,16 +7350,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandFeeVariability: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandFeeVariability';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7622,16 +7368,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setOnDemandQueueMaxSize: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandQueueMaxSize';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7641,16 +7386,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} new_
      **/
     setOnDemandTargetQueueUtilization: GenericTxCall<
-      Rv,
       (new_: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetOnDemandTargetQueueUtilization';
             params: { new: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7660,16 +7404,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} new_
      **/
     setMinimumBackingVotes: GenericTxCall<
-      Rv,
       (new_: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetMinimumBackingVotes';
             params: { new: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7680,19 +7423,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} value
      **/
     setNodeFeature: GenericTxCall<
-      Rv,
       (
         index: number,
         value: boolean,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetNodeFeature';
             params: { index: number; value: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7702,16 +7444,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ApprovalVotingParams} new_
      **/
     setApprovalVotingParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8ApprovalVotingParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetApprovalVotingParams';
             params: { new: PolkadotPrimitivesV8ApprovalVotingParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7721,23 +7462,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8SchedulerParams} new_
      **/
     setSchedulerParams: GenericTxCall<
-      Rv,
       (new_: PolkadotPrimitivesV8SchedulerParams) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Configuration';
           palletCall: {
             name: 'SetSchedulerParams';
             params: { new: PolkadotPrimitivesV8SchedulerParams };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasShared`'s transaction calls
@@ -7746,7 +7486,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInclusion`'s transaction calls
@@ -7755,7 +7495,7 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParaInherent`'s transaction calls
@@ -7767,23 +7507,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesVstagingInherentData} data
      **/
     enter: GenericTxCall<
-      Rv,
       (data: PolkadotPrimitivesVstagingInherentData) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParaInherent';
           palletCall: {
             name: 'Enter';
             params: { data: PolkadotPrimitivesVstagingInherentData };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Paras`'s transaction calls
@@ -7796,12 +7535,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     forceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7811,7 +7548,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7822,12 +7560,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceSetCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7837,7 +7573,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7849,13 +7586,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} relayParentNumber
      **/
     forceScheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
         relayParentNumber: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7866,7 +7601,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               relayParentNumber: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7877,12 +7613,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     forceNoteNewHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7892,7 +7626,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7904,16 +7639,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     forceQueueAction: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceQueueAction';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7936,16 +7670,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     addTrustedValidationCode: GenericTxCall<
-      Rv,
       (validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'AddTrustedValidationCode';
             params: { validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7959,16 +7692,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCodeHash} validationCodeHash
      **/
     pokeUnusedValidationCode: GenericTxCall<
-      Rv,
       (validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'PokeUnusedValidationCode';
             params: { validationCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -7980,12 +7712,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotPrimitivesV8ValidatorAppSignature} signature
      **/
     includePvfCheckStatement: GenericTxCall<
-      Rv,
       (
         stmt: PolkadotPrimitivesV8PvfCheckStatement,
         signature: PolkadotPrimitivesV8ValidatorAppSignature,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -7995,7 +7725,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: PolkadotPrimitivesV8ValidatorAppSignature;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8006,19 +7737,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} context
      **/
     forceSetMostRecentContext: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         context: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'ForceSetMostRecentContext';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; context: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8031,16 +7761,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeUpgradeCooldown: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
             name: 'RemoveUpgradeCooldown';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8062,13 +7791,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} validPeriod
      **/
     authorizeForceSetCurrentCodeHash: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCodeHash: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
         validPeriod: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -8079,7 +7806,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validPeriod: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8091,12 +7819,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     applyAuthorizedForceSetCurrentCode: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Paras';
           palletCall: {
@@ -8106,14 +7832,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Initializer`'s transaction calls
@@ -8127,23 +7854,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} upTo
      **/
     forceApprove: GenericTxCall<
-      Rv,
       (upTo: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Initializer';
           palletCall: {
             name: 'ForceApprove';
             params: { upTo: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Hrmp`'s transaction calls
@@ -8166,13 +7892,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} proposedMaxMessageSize
      **/
     hrmpInitOpenChannel: GenericTxCall<
-      Rv,
       (
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         proposedMaxCapacity: number,
         proposedMaxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8183,7 +7907,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               proposedMaxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8195,16 +7920,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} sender
      **/
     hrmpAcceptOpenChannel: GenericTxCall<
-      Rv,
       (sender: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpAcceptOpenChannel';
             params: { sender: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8217,16 +7941,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHrmpChannelId} channelId
      **/
     hrmpCloseChannel: GenericTxCall<
-      Rv,
       (channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCloseChannel';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8244,20 +7967,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} numOutbound
      **/
     forceCleanHrmp: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         numInbound: number,
         numOutbound: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceCleanHrmp';
             params: { para: PolkadotParachainPrimitivesPrimitivesId; numInbound: number; numOutbound: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8274,16 +7996,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpOpen: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpOpen';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8300,16 +8021,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} channels
      **/
     forceProcessHrmpClose: GenericTxCall<
-      Rv,
       (channels: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'ForceProcessHrmpClose';
             params: { channels: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8327,19 +8047,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} openRequests
      **/
     hrmpCancelOpenRequest: GenericTxCall<
-      Rv,
       (
         channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
         openRequests: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'HrmpCancelOpenRequest';
             params: { channelId: PolkadotParachainPrimitivesPrimitivesHrmpChannelId; openRequests: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8359,14 +8078,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     forceOpenHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8378,7 +8095,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8400,12 +8118,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     establishSystemChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8415,7 +8131,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8434,12 +8151,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} recipient
      **/
     pokeChannelDeposits: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
@@ -8449,7 +8164,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               recipient: PolkadotParachainPrimitivesPrimitivesId;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8465,23 +8181,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} targetSystemChain
      **/
     establishChannelWithSystem: GenericTxCall<
-      Rv,
       (targetSystemChain: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Hrmp';
           palletCall: {
             name: 'EstablishChannelWithSystem';
             params: { targetSystemChain: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasDisputes`'s transaction calls
@@ -8491,20 +8206,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceUnfreeze: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasDisputes';
           palletCall: 'ForceUnfreeze';
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasSlashing`'s transaction calls
@@ -8516,26 +8230,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDisputeLostUnsigned: GenericTxCall<
-      Rv,
       (
         disputeProof: PolkadotPrimitivesVstagingDisputeProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSlashing';
           palletCall: {
             name: 'ReportDisputeLostUnsigned';
             params: { disputeProof: PolkadotPrimitivesVstagingDisputeProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s transaction calls
@@ -8564,19 +8277,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderAllowDeath: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderAllowDeath';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8603,19 +8315,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This will be removed in favor of using `place_order_with_credits`
      **/
     placeOrderKeepAlive: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderKeepAlive';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8642,26 +8353,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} paraId
      **/
     placeOrderWithCredits: GenericTxCall<
-      Rv,
       (
         maxAmount: bigint,
         paraId: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'OnDemandAssignmentProvider';
           palletCall: {
             name: 'PlaceOrderWithCredits';
             params: { maxAmount: bigint; paraId: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Registrar`'s transaction calls
@@ -8694,13 +8404,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     register: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8711,7 +8419,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8730,7 +8439,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} validationCode
      **/
     forceRegister: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         deposit: bigint,
@@ -8738,7 +8446,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         genesisHead: PolkadotParachainPrimitivesPrimitivesHeadData,
         validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8751,7 +8458,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               validationCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8764,16 +8472,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     deregister: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Deregister';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8795,19 +8502,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} other
      **/
     swap: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         other: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Swap';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; other: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8820,16 +8526,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     removeLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'RemoveLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8854,15 +8559,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     reserve: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'Reserve';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8876,16 +8580,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     addLock: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
             name: 'AddLock';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8906,12 +8609,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesValidationCode} newCode
      **/
     scheduleCodeUpgrade: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newCode: PolkadotParachainPrimitivesPrimitivesValidationCode,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8921,7 +8622,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newCode: PolkadotParachainPrimitivesPrimitivesValidationCode;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -8935,12 +8637,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesHeadData} newHead
      **/
     setCurrentHead: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         newHead: PolkadotParachainPrimitivesPrimitivesHeadData,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Registrar';
           palletCall: {
@@ -8950,14 +8650,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               newHead: PolkadotParachainPrimitivesPrimitivesHeadData;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Slots`'s transaction calls
@@ -8976,7 +8677,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} periodCount
      **/
     forceLease: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         leaser: AccountId32Like,
@@ -8984,7 +8684,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         periodBegin: number,
         periodCount: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
@@ -8997,7 +8696,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               periodCount: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9009,16 +8709,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     clearAllLeases: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'ClearAllLeases';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9034,23 +8733,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
     triggerOnboard: GenericTxCall<
-      Rv,
       (para: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Slots';
           palletCall: {
             name: 'TriggerOnboard';
             params: { para: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `ParasSudoWrapper`'s transaction calls
@@ -9067,12 +8765,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeParachainsParasParaGenesisArgs} genesis
      **/
     sudoScheduleParaInitialize: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         genesis: PolkadotRuntimeParachainsParasParaGenesisArgs,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
@@ -9082,7 +8778,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               genesis: PolkadotRuntimeParachainsParasParaGenesisArgs;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9092,16 +8789,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParaCleanup: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParaCleanup';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9111,16 +8807,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParathreadUpgrade: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParathreadUpgrade';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9130,16 +8825,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     sudoScheduleParachainDowngrade: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
             name: 'SudoScheduleParachainDowngrade';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9153,19 +8847,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} xcm
      **/
     sudoQueueDownwardXcm: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         xcm: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
             name: 'SudoQueueDownwardXcm';
             params: { id: PolkadotParachainPrimitivesPrimitivesId; xcm: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9181,14 +8874,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} maxMessageSize
      **/
     sudoEstablishHrmpChannel: GenericTxCall<
-      Rv,
       (
         sender: PolkadotParachainPrimitivesPrimitivesId,
         recipient: PolkadotParachainPrimitivesPrimitivesId,
         maxCapacity: number,
         maxMessageSize: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'ParasSudoWrapper';
           palletCall: {
@@ -9200,14 +8891,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maxMessageSize: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Auctions`'s transaction calls
@@ -9224,19 +8916,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} leasePeriodIndex
      **/
     newAuction: GenericTxCall<
-      Rv,
       (
         duration: number,
         leasePeriodIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'NewAuction';
             params: { duration: number; leasePeriodIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9265,7 +8956,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     bid: GenericTxCall<
-      Rv,
       (
         para: PolkadotParachainPrimitivesPrimitivesId,
         auctionIndex: number,
@@ -9273,7 +8963,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         lastSlot: number,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
@@ -9286,7 +8975,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               amount: bigint;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9297,22 +8987,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     cancelAuction: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Auctions';
           palletCall: {
             name: 'CancelAuction';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Crowdloan`'s transaction calls
@@ -9333,7 +9022,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     create: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -9342,7 +9030,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9356,7 +9043,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9369,13 +9057,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contribute: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         value: bigint,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9386,7 +9072,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               signature: SpRuntimeMultiSignature | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9413,19 +9100,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     withdraw: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         index: PolkadotParachainPrimitivesPrimitivesId,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Withdraw';
             params: { who: AccountId32Like; index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9439,16 +9125,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     refund: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Refund';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9458,16 +9143,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     dissolve: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Dissolve';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9484,7 +9168,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSigner | undefined} verifier
      **/
     edit: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         cap: bigint,
@@ -9493,7 +9176,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         end: number,
         verifier: SpRuntimeMultiSigner | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
@@ -9507,7 +9189,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               verifier: SpRuntimeMultiSigner | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9520,19 +9203,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {BytesLike} memo
      **/
     addMemo: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         memo: BytesLike,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'AddMemo';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; memo: BytesLike };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9544,16 +9226,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} index
      **/
     poke: GenericTxCall<
-      Rv,
       (index: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'Poke';
             params: { index: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9566,26 +9247,25 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpRuntimeMultiSignature | undefined} signature
      **/
     contributeAll: GenericTxCall<
-      Rv,
       (
         index: PolkadotParachainPrimitivesPrimitivesId,
         signature: SpRuntimeMultiSignature | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Crowdloan';
           palletCall: {
             name: 'ContributeAll';
             params: { index: PolkadotParachainPrimitivesPrimitivesId; signature: SpRuntimeMultiSignature | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssignedSlots`'s transaction calls
@@ -9597,16 +9277,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     assignPermParachainSlot: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssignedSlots';
           palletCall: {
             name: 'AssignPermParachainSlot';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9619,12 +9298,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonAssignedSlotsSlotLeasePeriodStart} leasePeriodStart
      **/
     assignTempParachainSlot: GenericTxCall<
-      Rv,
       (
         id: PolkadotParachainPrimitivesPrimitivesId,
         leasePeriodStart: PolkadotRuntimeCommonAssignedSlotsSlotLeasePeriodStart,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssignedSlots';
           palletCall: {
@@ -9634,7 +9311,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               leasePeriodStart: PolkadotRuntimeCommonAssignedSlotsSlotLeasePeriodStart;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9644,16 +9322,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotParachainPrimitivesPrimitivesId} id
      **/
     unassignParachainSlot: GenericTxCall<
-      Rv,
       (id: PolkadotParachainPrimitivesPrimitivesId) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssignedSlots';
           palletCall: {
             name: 'UnassignParachainSlot';
             params: { id: PolkadotParachainPrimitivesPrimitivesId };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9663,16 +9340,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} slots
      **/
     setMaxPermanentSlots: GenericTxCall<
-      Rv,
       (slots: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssignedSlots';
           palletCall: {
             name: 'SetMaxPermanentSlots';
             params: { slots: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9682,23 +9358,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} slots
      **/
     setMaxTemporarySlots: GenericTxCall<
-      Rv,
       (slots: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssignedSlots';
           palletCall: {
             name: 'SetMaxTemporarySlots';
             params: { slots: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Coretime`'s transaction calls
@@ -9715,16 +9390,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} count
      **/
     requestCoreCount: GenericTxCall<
-      Rv,
       (count: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestCoreCount';
             params: { count: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9737,16 +9411,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} when
      **/
     requestRevenueAt: GenericTxCall<
-      Rv,
       (when: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'RequestRevenueAt';
             params: { when: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9756,19 +9429,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint} amount
      **/
     creditAccount: GenericTxCall<
-      Rv,
       (
         who: AccountId32Like,
         amount: bigint,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
             name: 'CreditAccount';
             params: { who: AccountId32Like; amount: bigint };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9789,7 +9461,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} endHint
      **/
     assignCore: GenericTxCall<
-      Rv,
       (
         core: number,
         begin: number,
@@ -9798,7 +9469,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         >,
         endHint: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Coretime';
           palletCall: {
@@ -9812,14 +9482,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               endHint: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `StakingAhClient`'s transaction calls
@@ -9830,16 +9501,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncRcClientValidatorSetReport} report
      **/
     validatorSet: GenericTxCall<
-      Rv,
       (report: PalletStakingAsyncRcClientValidatorSetReport) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ValidatorSet';
             params: { report: PalletStakingAsyncRcClientValidatorSetReport };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9849,16 +9519,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletStakingAsyncAhClientOperatingMode} mode
      **/
     setMode: GenericTxCall<
-      Rv,
       (mode: PalletStakingAsyncAhClientOperatingMode) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'SetMode';
             params: { mode: PalletStakingAsyncAhClientOperatingMode };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9867,22 +9536,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnMigrationEnd: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'StakingAhClient';
           palletCall: {
             name: 'ForceOnMigrationEnd';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MultiBlockMigrations`'s transaction calls
@@ -9898,16 +9566,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsMigrationCursor | undefined} cursor
      **/
     forceSetCursor: GenericTxCall<
-      Rv,
       (cursor: PalletMigrationsMigrationCursor | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetCursor';
             params: { cursor: PalletMigrationsMigrationCursor | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9924,20 +9591,19 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} startedAt
      **/
     forceSetActiveCursor: GenericTxCall<
-      Rv,
       (
         index: number,
         innerCursor: BytesLike | undefined,
         startedAt: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceSetActiveCursor';
             params: { index: number; innerCursor: BytesLike | undefined; startedAt: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9949,15 +9615,14 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     forceOnboardMbms: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ForceOnboardMbms';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -9971,23 +9636,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMigrationsHistoricCleanupSelector} selector
      **/
     clearHistoric: GenericTxCall<
-      Rv,
       (selector: PalletMigrationsHistoricCleanupSelector) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MultiBlockMigrations';
           palletCall: {
             name: 'ClearHistoric';
             params: { selector: PalletMigrationsHistoricCleanupSelector };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `XcmPallet`'s transaction calls
@@ -9999,19 +9663,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedXcm} message
      **/
     send: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         message: XcmVersionedXcm,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Send';
             params: { dest: XcmVersionedLocation; message: XcmVersionedXcm };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10043,14 +9706,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_teleport_assets` or `transfer_assets`
      **/
     teleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10062,7 +9723,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10106,14 +9768,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @deprecated This extrinsic uses `WeightLimit::Unlimited`, please migrate to `limited_reserve_transfer_assets` or `transfer_assets`
      **/
     reserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
         assets: XcmVersionedAssets,
         feeAssetItem: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10125,7 +9785,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               feeAssetItem: number;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10143,19 +9804,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} maxWeight
      **/
     execute: GenericTxCall<
-      Rv,
       (
         message: XcmVersionedXcm,
         maxWeight: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'Execute';
             params: { message: XcmVersionedXcm; maxWeight: SpWeightsWeightV2Weight };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10171,19 +9831,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} version
      **/
     forceXcmVersion: GenericTxCall<
-      Rv,
       (
         location: StagingXcmV5Location,
         version: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceXcmVersion';
             params: { location: StagingXcmV5Location; version: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10197,16 +9856,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeXcmVersion
      **/
     forceDefaultXcmVersion: GenericTxCall<
-      Rv,
       (maybeXcmVersion: number | undefined) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceDefaultXcmVersion';
             params: { maybeXcmVersion: number | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10219,16 +9877,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceSubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10243,16 +9900,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} location
      **/
     forceUnsubscribeVersionNotify: GenericTxCall<
-      Rv,
       (location: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceUnsubscribeVersionNotify';
             params: { location: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10295,7 +9951,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedReserveTransferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -10303,7 +9958,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10316,7 +9970,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10347,7 +10002,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     limitedTeleportAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -10355,7 +10009,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10368,7 +10021,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10381,16 +10035,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {boolean} suspended
      **/
     forceSuspension: GenericTxCall<
-      Rv,
       (suspended: boolean) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ForceSuspension';
             params: { suspended: boolean };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10436,7 +10089,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssets: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         beneficiary: XcmVersionedLocation,
@@ -10444,7 +10096,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         feeAssetItem: number,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10457,7 +10108,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10473,19 +10125,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} beneficiary
      **/
     claimAssets: GenericTxCall<
-      Rv,
       (
         assets: XcmVersionedAssets,
         beneficiary: XcmVersionedLocation,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'ClaimAssets';
             params: { assets: XcmVersionedAssets; beneficiary: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10548,7 +10199,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmV3WeightLimit} weightLimit
      **/
     transferAssetsUsingTypeAndThen: GenericTxCall<
-      Rv,
       (
         dest: XcmVersionedLocation,
         assets: XcmVersionedAssets,
@@ -10558,7 +10208,6 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
         customXcmOnDest: XcmVersionedXcm,
         weightLimit: XcmV3WeightLimit,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
@@ -10573,7 +10222,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: XcmV3WeightLimit;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10594,19 +10244,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {bigint | undefined} expires
      **/
     addAuthorizedAlias: GenericTxCall<
-      Rv,
       (
         aliaser: XcmVersionedLocation,
         expires: bigint | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'AddAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation; expires: bigint | undefined };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10617,16 +10266,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {XcmVersionedLocation} aliaser
      **/
     removeAuthorizedAlias: GenericTxCall<
-      Rv,
       (aliaser: XcmVersionedLocation) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAuthorizedAlias';
             params: { aliaser: XcmVersionedLocation };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10636,22 +10284,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     removeAllAuthorizedAliases: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'XcmPallet';
           palletCall: {
             name: 'RemoveAllAuthorizedAliases';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MessageQueue`'s transaction calls
@@ -10664,19 +10311,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} pageIndex
      **/
     reapPage: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         pageIndex: number,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
             name: 'ReapPage';
             params: { messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin; pageIndex: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10701,14 +10347,12 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpWeightsWeightV2Weight} weightLimit
      **/
     executeOverweight: GenericTxCall<
-      Rv,
       (
         messageOrigin: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin,
         page: number,
         index: number,
         weightLimit: SpWeightsWeightV2Weight,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MessageQueue';
           palletCall: {
@@ -10720,14 +10364,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               weightLimit: SpWeightsWeightV2Weight;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `AssetRate`'s transaction calls
@@ -10743,19 +10388,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     create: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Create';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10769,19 +10413,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {FixedU128} rate
      **/
     update: GenericTxCall<
-      Rv,
       (
         assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset,
         rate: FixedU128,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Update';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset; rate: FixedU128 };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10794,23 +10437,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PolkadotRuntimeCommonImplsVersionedLocatableAsset} assetKind
      **/
     remove: GenericTxCall<
-      Rv,
       (assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'AssetRate';
           palletCall: {
             name: 'Remove';
             params: { assetKind: PolkadotRuntimeCommonImplsVersionedLocatableAsset };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RootTesting`'s transaction calls
@@ -10822,16 +10464,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Perbill} ratio
      **/
     fillBlock: GenericTxCall<
-      Rv,
       (ratio: Perbill) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'FillBlock';
             params: { ratio: Perbill };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10839,22 +10480,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      *
      **/
     triggerDefensive: GenericTxCall<
-      Rv,
       () => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootTesting';
           palletCall: {
             name: 'TriggerDefensive';
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `MetaTx`'s transaction calls
@@ -10869,23 +10509,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {PalletMetaTxMetaTx} metaTx
      **/
     dispatch: GenericTxCall<
-      Rv,
       (metaTx: PalletMetaTxMetaTx) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'MetaTx';
           palletCall: {
             name: 'Dispatch';
             params: { metaTx: PalletMetaTxMetaTx };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `RootOffences`'s transaction calls
@@ -10902,13 +10541,11 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number | undefined} maybeSessionIndex
      **/
     createOffence: GenericTxCall<
-      Rv,
       (
         offenders: Array<[AccountId32Like, Perbill]>,
         maybeIdentifications: Array<SpStakingExposure> | undefined,
         maybeSessionIndex: number | undefined,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootOffences';
           palletCall: {
@@ -10919,7 +10556,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               maybeSessionIndex: number | undefined;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -10937,23 +10575,22 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {Array<[[AccountId32Like, SpStakingExposure], number, bigint, number]>} offences
      **/
     reportOffence: GenericTxCall<
-      Rv,
       (offences: Array<[[AccountId32Like, SpStakingExposure], number, bigint, number]>) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'RootOffences';
           palletCall: {
             name: 'ReportOffence';
             params: { offences: Array<[[AccountId32Like, SpStakingExposure], number, bigint, number]> };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `Beefy`'s transaction calls
@@ -10969,19 +10606,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVoting';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11000,19 +10636,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportDoubleVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyDoubleVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportDoubleVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyDoubleVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11025,16 +10660,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {number} delayInBlocks
      **/
     setNewGenesis: GenericTxCall<
-      Rv,
       (delayInBlocks: number) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'SetNewGenesis';
             params: { delayInBlocks: number };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11047,19 +10681,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVoting';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11077,19 +10710,18 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportForkVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyForkVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
             name: 'ReportForkVotingUnsigned';
             params: { equivocationProof: SpConsensusBeefyForkVotingProof; keyOwnerProof: SpSessionMembershipProof };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11102,12 +10734,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVoting: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11117,7 +10747,8 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11135,12 +10766,10 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {SpSessionMembershipProof} keyOwnerProof
      **/
     reportFutureBlockVotingUnsigned: GenericTxCall<
-      Rv,
       (
         equivocationProof: SpConsensusBeefyFutureBlockVotingProof,
         keyOwnerProof: SpSessionMembershipProof,
       ) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'Beefy';
           palletCall: {
@@ -11150,14 +10779,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
               keyOwnerProof: SpSessionMembershipProof;
             };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
   /**
    * Pallet `IdentityMigrator`'s transaction calls
@@ -11170,16 +10800,15 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     reapIdentity: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IdentityMigrator';
           palletCall: {
             name: 'ReapIdentity';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
@@ -11190,22 +10819,21 @@ export interface ChainTx<Rv extends RpcVersion> extends GenericChainTx<Rv, TxCal
      * @param {AccountId32Like} who
      **/
     pokeDeposit: GenericTxCall<
-      Rv,
       (who: AccountId32Like) => ChainSubmittableExtrinsic<
-        Rv,
         {
           pallet: 'IdentityMigrator';
           palletCall: {
             name: 'PokeDeposit';
             params: { who: AccountId32Like };
           };
-        }
+        },
+        ChainKnownTypes
       >
     >;
 
     /**
      * Generic pallet tx call
      **/
-    [callName: string]: GenericTxCall<Rv, TxCall<Rv>>;
+    [callName: string]: GenericTxCall<TxCall<ChainKnownTypes>>;
   };
 }
diff --git a/packages/chaintypes/src/westend/view-functions.d.ts b/packages/chaintypes/src/westend/view-functions.d.ts
index 0fc95e4f..7032fa57 100644
--- a/packages/chaintypes/src/westend/view-functions.d.ts
+++ b/packages/chaintypes/src/westend/view-functions.d.ts
@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainViewFunctions, GenericViewFunction, RpcVersion } from 'dedot/types';
+import type { GenericChainViewFunctions, GenericViewFunction } from 'dedot/types';
 import type { AccountId32Like } from 'dedot/codecs';
 import type {
   WestendRuntimeRuntimeCallLike,
@@ -8,7 +8,7 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
 } from './types.js';
 
-export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainViewFunctions<Rv> {
+export interface ChainViewFunctions extends GenericChainViewFunctions {
   /**
    * Pallet `Proxy`'s view functions
    **/
@@ -20,7 +20,6 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {WestendRuntimeProxyType} proxyType
      **/
     checkPermissions: GenericViewFunction<
-      Rv,
       (call: WestendRuntimeRuntimeCallLike, proxyType: WestendRuntimeProxyType) => Promise<boolean>
     >;
 
@@ -31,14 +30,13 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      * @param {WestendRuntimeProxyType} against
      **/
     isSuperset: GenericViewFunction<
-      Rv,
       (toCheck: WestendRuntimeProxyType, against: WestendRuntimeProxyType) => Promise<boolean>
     >;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `VoterList`'s view functions
@@ -55,12 +53,12 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {AccountId32Like} who
      **/
-    scores: GenericViewFunction<Rv, (who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
+    scores: GenericViewFunction<(who: AccountId32Like) => Promise<[bigint | undefined, bigint | undefined]>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
   /**
    * Pallet `Paras`'s view functions
@@ -71,14 +69,11 @@ export interface ChainViewFunctions<Rv extends RpcVersion> extends GenericChainV
      *
      * @param {PolkadotParachainPrimitivesPrimitivesId} para
      **/
-    removeUpgradeCooldownCost: GenericViewFunction<
-      Rv,
-      (para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>
-    >;
+    removeUpgradeCooldownCost: GenericViewFunction<(para: PolkadotParachainPrimitivesPrimitivesId) => Promise<bigint>>;
 
     /**
      * Generic pallet view function
      **/
-    [name: string]: GenericViewFunction<Rv>;
+    [name: string]: GenericViewFunction;
   };
 }
diff --git a/scripts/gen.ts b/scripts/gen.ts
index 4048fc29..d15ddec4 100644
--- a/scripts/gen.ts
+++ b/scripts/gen.ts
@@ -11,7 +11,12 @@ async function run() {
 
     if (endpoint) {
       console.log(`Generate types for ${chain} via endpoint ${endpoint}`);
-      await generateTypesFromEndpoint(chain, endpoint[0], OUT_DIR, undefined, true);
+      await generateTypesFromEndpoint({
+        chain,
+        endpoint: endpoint[0],
+        outDir: OUT_DIR,
+        useSubPaths: true,
+      });
     } else if (staticData) {
       const { metadataHex = '0x', rpcMethods = [] } = staticData;
       console.log(`Generate types for ${chain} via raw data`);
@@ -25,11 +30,18 @@ async function run() {
             return o;
           },
           {} as Record<string, number>,
-        )
+        ),
 
-      }
+      };
 
-      await generateTypes(chain, metadata.latest, rpcMethods, substrateRuntimeVersion, OUT_DIR, undefined, true);
+      await generateTypes({
+        chain,
+        metadata: metadata.latest,
+        rpcMethods,
+        runtimeVersion: substrateRuntimeVersion,
+        outDir: OUT_DIR,
+        useSubPaths: true,
+      });
     }
   }
 
diff --git a/scripts/networks.ts b/scripts/networks.ts
index aa52b17a..7984528e 100644
--- a/scripts/networks.ts
+++ b/scripts/networks.ts
@@ -49,7 +49,7 @@ export const networks: NetworkInfo[] = [
   },
   {
     chain: 'moonbeam',
-    endpoint: ['wss://wss.api.moonbeam.network'],
+    endpoint: ['wss://moonbeam.api.onfinality.io/public-ws'],
   },
   {
     chain: 'aleph',
@@ -65,7 +65,7 @@ export const networks: NetworkInfo[] = [
   },
   {
     chain: 'westendPeople',
-    endpoint: ['wss://people-westend-rpc.dwellir.com'],
+    endpoint: ['wss://westend-people-rpc.polkadot.io'],
   },
   {
     chain: 'paseo',
diff --git a/yarn.lock b/yarn.lock
index d7676991..4fdf617b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,6 +5,13 @@ __metadata:
   version: 8
   cacheKey: 10
 
+"@adraffy/ens-normalize@npm:^1.11.0":
+  version: 1.11.1
+  resolution: "@adraffy/ens-normalize@npm:1.11.1"
+  checksum: 10/dd19274d9fcaf99bf08a62b64e54f4748de11b235767addbd3f7385ae1b7777bd704d17ff003ffaa3295a0b9d035929381cf3b38329c96260bff96aab8ad7b37
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/code-frame@npm:7.24.7"
@@ -160,18 +167,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@dedot/api@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/api@npm:0.16.0"
+"@dedot/api@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/api@npm:1.0.0"
   dependencies:
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/providers": "npm:0.16.0"
-    "@dedot/runtime-specs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/storage": "npm:0.16.0"
-    "@dedot/types": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-  checksum: 10/46925e35a35fc6ca88ea94acb66a3557b16a8603ac26180d35ae94c273c2693c516e109ec199ed27fc31d2a1d9f7e4436bd4133335f06ff28dcb9bce3584136c
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/providers": "npm:1.0.0"
+    "@dedot/runtime-specs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/storage": "npm:1.0.0"
+    "@dedot/types": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+  checksum: 10/6dc0736254e19df2cefd9949a7dd1784c33450d0a859c37c852f4f7f205bc1076db9e80a63ff36b71d18d575303935d6aea161ad41d8ae63af4664156c365cfc
   languageName: node
   linkType: hard
 
@@ -179,146 +186,153 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@dedot/chaintypes@workspace:packages/chaintypes"
   peerDependencies:
-    dedot: ">=0.16.0"
+    dedot: ">=1.0.0"
   languageName: unknown
   linkType: soft
 
-"@dedot/cli@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/cli@npm:0.16.0"
+"@dedot/cli@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/cli@npm:1.0.0"
   dependencies:
-    "@dedot/api": "npm:0.16.0"
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/codegen": "npm:0.16.0"
-    "@polkadot-api/wasm-executor": "npm:^0.1.2"
-    "@polkadot/types-support": "npm:^16.4.6"
+    "@dedot/api": "npm:1.0.0"
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/codegen": "npm:1.0.0"
+    "@dedot/wasm": "npm:^0.1.0"
+    "@polkadot/types-support": "npm:^16.5.3"
     ora: "npm:^8.2.0"
     yargs: "npm:^17.7.2"
   bin:
     dedot: bin/dedot.mjs
     djs: bin/dedot.mjs
-  checksum: 10/895842a07d19730b21ab39e487f5160c44a2ddf0d9df77feafa3460f1d895082a0b09a38d9d87c647fe6de6a18bdd7d063ce5d41a432df00df94beeaf22f08dd
+  checksum: 10/9681eaf8cfd929256b408af6b8d30bf16929142ff5376ef7c84a412d900d27b61fa7ade89ca0caf98b7fdd1d648922c015349b26d3fdc4ef85d546d69aae949f
   languageName: node
   linkType: hard
 
-"@dedot/codecs@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/codecs@npm:0.16.0"
+"@dedot/codecs@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/codecs@npm:1.0.0"
   dependencies:
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-  checksum: 10/72e20553c2df341914ec21acb234ab7cd0327f72c04347647acc7c6ed361f12c5f7d3146dd1b3c2f6a5e8e1456b87dcd47743a06c3826e2af304a2d3c2de45bc
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+  checksum: 10/a87ee08d0c9affdae64e85f58b01e1721e8c3f7bffbfe25500c8d116ded51149222698b5a59fcbd15cf905dfce87445af003d5a01e26dd9d02861292e4221122
   languageName: node
   linkType: hard
 
-"@dedot/codegen@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/codegen@npm:0.16.0"
-  dependencies:
-    "@dedot/api": "npm:0.16.0"
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/contracts": "npm:0.16.0"
-    "@dedot/providers": "npm:0.16.0"
-    "@dedot/runtime-specs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/types": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
+"@dedot/codegen@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/codegen@npm:1.0.0"
+  dependencies:
+    "@dedot/api": "npm:1.0.0"
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/contracts": "npm:1.0.0"
+    "@dedot/providers": "npm:1.0.0"
+    "@dedot/runtime-specs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/types": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
     handlebars: "npm:^4.7.8"
-    prettier: "npm:^3.6.2"
-  checksum: 10/93ffdbbc300f63db20b6fd176d2215bc3ce3418dbc9ddd4d2f3a24460335279edadf5e9c541a6aca6f4662e83fe50a3945cd40aa937910bf00ded03c8ccc491d
+    prettier: "npm:^3.7.3"
+  checksum: 10/7978504714a9589cbd47493c141dbfb4f88b819a51acfd917fa283a2f71b7128240d73b68f7e44cd1c145bcc6de164e5f6aa65c6023ad93cc374f26f7b97cba2
   languageName: node
   linkType: hard
 
-"@dedot/contracts@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/contracts@npm:0.16.0"
+"@dedot/contracts@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/contracts@npm:1.0.0"
   dependencies:
-    "@dedot/api": "npm:0.16.0"
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/types": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-    "@ethereumjs/rlp": "npm:^10.0.0"
-  checksum: 10/67664fb0b9d6fe6d3891cf37931635d6ff5b636a29517e9bc28818476c0a80d52b30ba3347c4fbc4349b130d0acaf72e5db3517067d0e434cf4decdef356368e
+    "@dedot/api": "npm:1.0.0"
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/types": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+    viem: "npm:^2.40.3"
+  checksum: 10/0ea4bbfa8c1d08ab0ee66bb8836645d45be6e52cbb90d895b007619665f986c69127768908f7614f753bcfc0502ae93acf7eafd94496039a38e92d271289f830
   languageName: node
   linkType: hard
 
-"@dedot/merkleized-metadata@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/merkleized-metadata@npm:0.16.0"
+"@dedot/merkleized-metadata@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/merkleized-metadata@npm:1.0.0"
   dependencies:
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-  checksum: 10/3d17d21fd6adab01738aa37cdc76d741f2de39e7b0b5ceaa831912c530278e0e8d178e222e2bc5946fcdc1e65b7b05a37f53343114167d4772ccfd367fd34481
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+  checksum: 10/88b5bb7981b6d1cf65b541efa849c146184f07c2ff51c6aec97c041e536b044d0e7466bd6d4b11641796f01242d82dfd1a5c4fc5eb9472f47613ba6dcbb7082d
   languageName: node
   linkType: hard
 
-"@dedot/providers@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/providers@npm:0.16.0"
+"@dedot/providers@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/providers@npm:1.0.0"
   dependencies:
-    "@dedot/utils": "npm:0.16.0"
-    "@polkadot/x-ws": "npm:^13.5.6"
-  checksum: 10/42123a6e2d23d3bf95f03be3b7a91a89f0e258e33e3e0ec241e0b22312b217067a96ec2ee0246544bdfb8833989905760e52345e86d8eaf53a97b521a9654d52
+    "@dedot/utils": "npm:1.0.0"
+    "@polkadot/x-ws": "npm:^13.5.9"
+  checksum: 10/a57f5dd7ce98e85aa8c8fc475997b2312b94a81ba1bbd860bae13a9dfa69250032226a74bc4d4377ef2ecad42706785cd8393766b75957d83a4bf67101f00ec9
   languageName: node
   linkType: hard
 
-"@dedot/runtime-specs@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/runtime-specs@npm:0.16.0"
+"@dedot/runtime-specs@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/runtime-specs@npm:1.0.0"
   dependencies:
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/types": "npm:0.16.0"
-  checksum: 10/5ea90ae4f8d5fcafc5ab66835d194ae561e508ec43d52da450f3f972b51d305c1b635e8c8fb28836256705f2ce8c09728de03974e71cc015660824ed3832d11a
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/types": "npm:1.0.0"
+  checksum: 10/282e311327cd2b3be460d590ae52a01b86184e9dac2ae74acad404d946fd0b2be3aaecfd37ce62ef182f863a0d83fdb3426aaa3b3cb5774fc8231af02c2f51db
   languageName: node
   linkType: hard
 
-"@dedot/shape@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/shape@npm:0.16.0"
+"@dedot/shape@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/shape@npm:1.0.0"
   dependencies:
-    "@dedot/utils": "npm:0.16.0"
+    "@dedot/utils": "npm:1.0.0"
     deshape: "npm:^0.1.0"
-  checksum: 10/3eddbc3a18fe414496021d8e865397b112d04a6ca595ef07fb62ef3fb3d8ad6455075770d2e4e9a7deedbc9fca08dab41c8201ceae6aa2cd81c70893335c87bb
+  checksum: 10/93255ac0be4af682278acea080c1e83abe7994b86f0bbf25d58fbabfa6b1dd34d41cc48d2d26a38c033ab73905348bf7b4ad7ddd2f61b6ba98c7343025f43357
   languageName: node
   linkType: hard
 
-"@dedot/smoldot@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/smoldot@npm:0.16.0"
+"@dedot/smoldot@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/smoldot@npm:1.0.0"
   dependencies:
-    smoldot: "npm:^2.0.38"
-  checksum: 10/c985907b276d752cf3625eb71130558e7fb8d3ac78cacbefc33b262bbf97adea0e573c10aa65a5e30353d25864350c45af5dc008f299c4fe3cb92424c2241b5b
+    smoldot: "npm:^2.0.40"
+  checksum: 10/3d6cd50b39acdc0eb19dd2e849ee9fc612ebf6067b64418441c39bd81f3b65632c4ff3af68f608fd836680b957f4a53eaa7692e5a946461ce091ececf4a1a7d5
   languageName: node
   linkType: hard
 
-"@dedot/storage@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/storage@npm:0.16.0"
-  checksum: 10/abf9d3014503c00e13082155beef5b106cc2b3424c850ebf59514147e6ed8875a52d55703c1e9502b27843328ba66d31e1e232282e6d444d0cb5b9a49ea61bfc
+"@dedot/storage@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/storage@npm:1.0.0"
+  checksum: 10/b38fd8c60bca75fdefb5dc30aecd7aedfacb2c68be111427e3616dfbea805bd4b7adbe2492b83af3159de02ef979fa217bcfaf70fb90b3dd1b8565daeaa56130
   languageName: node
   linkType: hard
 
-"@dedot/types@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/types@npm:0.16.0"
+"@dedot/types@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/types@npm:1.0.0"
   dependencies:
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-  checksum: 10/523d02378c3bca79954617fdc7f2e1ddc7c0afc37f01715707b035c99530cfaadcae0d4d715ddddd275add5055b8838c260c7fa5b1266919f8e96693b3b822ff
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+  checksum: 10/f6008709a2aa94736659569c7dc425955cf8b78838338e7b32000ac550617476f079ceebbca6a3934300ba3391e2a0ac4a3568b0b5589ce9f7ecf5971f7a1129
   languageName: node
   linkType: hard
 
-"@dedot/utils@npm:0.16.0":
-  version: 0.16.0
-  resolution: "@dedot/utils@npm:0.16.0"
+"@dedot/utils@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@dedot/utils@npm:1.0.0"
   dependencies:
     "@noble/hashes": "npm:^1.8.0"
     "@scure/base": "npm:^1.2.6"
     eventemitter3: "npm:^5.0.1"
-  checksum: 10/330a1978abc0ae1c0d79ff7f04f2e60aef100f37b8971872d2c256ba96098c31a4692874be3f2e3e2209c1af53fd0bc4c98101ce6b9399d6822e55dc4d1dd8b5
+  checksum: 10/2b341571ca27e5318577b299aa83c9d23b078819eded91f13dff8bd156563517a2043d3b297b13074986d60d74b6844fc525dba57378984eec1eeafec2b34b59
+  languageName: node
+  linkType: hard
+
+"@dedot/wasm@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@dedot/wasm@npm:0.1.0"
+  checksum: 10/39afbdbf851eaf587d82ac643f6c20d21fa74f7222673e03dde2a8f24cc17365ee44c4129e1ca8317ebe75f108b6372769b41f41f251684dc7182853d8eac69e
   languageName: node
   linkType: hard
 
@@ -497,15 +511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/rlp@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@ethereumjs/rlp@npm:10.0.0"
-  bin:
-    rlp: bin/rlp.cjs
-  checksum: 10/3232f40ecc8dcd440994194925f9b8e74bf8f5eb995f98db9715b924358485ad5f332d529776537cc57e0c3393d1f0955014edbaefffa6935d4919de5f47c47d
-  languageName: node
-  linkType: hard
-
 "@gar/promisify@npm:^1.1.3":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
@@ -669,7 +674,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:^1.8.0":
+"@noble/ciphers@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@noble/ciphers@npm:1.3.0"
+  checksum: 10/051660051e3e9e2ca5fb9dece2885532b56b7e62946f89afa7284a0fb8bc02e2bd1c06554dba68162ff42d295b54026456084198610f63c296873b2f1cd7a586
+  languageName: node
+  linkType: hard
+
+"@noble/curves@npm:1.9.1":
+  version: 1.9.1
+  resolution: "@noble/curves@npm:1.9.1"
+  dependencies:
+    "@noble/hashes": "npm:1.8.0"
+  checksum: 10/5c82ec828ca4a4218b1666ba0ddffde17afd224d0bd5e07b64c2a0c83a3362483387f55c11cfd8db0fc046605394fe4e2c67fe024628a713e864acb541a7d2bb
+  languageName: node
+  linkType: hard
+
+"@noble/curves@npm:~1.9.0":
+  version: 1.9.7
+  resolution: "@noble/curves@npm:1.9.7"
+  dependencies:
+    "@noble/hashes": "npm:1.8.0"
+  checksum: 10/3cfe2735ea94972988ca9e217e0ebb2044372a7160b2079bf885da789492a6291fc8bf76ca3d8bf8dee477847ee2d6fac267d1e6c4f555054059f5e8c4865d44
+  languageName: node
+  linkType: hard
+
+"@noble/hashes@npm:1.8.0, @noble/hashes@npm:^1.8.0, @noble/hashes@npm:~1.8.0":
   version: 1.8.0
   resolution: "@noble/hashes@npm:1.8.0"
   checksum: 10/474b7f56bc6fb2d5b3a42132561e221b0ea4f91e590f4655312ca13667840896b34195e2b53b7f097ec080a1fdd3b58d902c2a8d0fbdf51d2e238b53808a177e
@@ -1080,13 +1110,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot-api/wasm-executor@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "@polkadot-api/wasm-executor@npm:0.1.2"
-  checksum: 10/14f977184305508182df46a223430e2dd698f7e08358c1aa07c6884be8d31a0df09c98458c3c6a13f5930f57a192b63707020c35a16d9989a5b8cd1e540981d3
-  languageName: node
-  linkType: hard
-
 "@polkadot/types-support@npm:^16.4.6":
   version: 16.4.6
   resolution: "@polkadot/types-support@npm:16.4.6"
@@ -1097,6 +1120,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/types-support@npm:^16.5.3":
+  version: 16.5.3
+  resolution: "@polkadot/types-support@npm:16.5.3"
+  dependencies:
+    "@polkadot/util": "npm:^13.5.9"
+    tslib: "npm:^2.8.1"
+  checksum: 10/d3429f52a841695605a9697061d3edf59ea430a6214725d8f3f2cc73a5da49d2376f487c956d2722e4b57c90e12ab390a75a1646b4bb366eb57659fd2fd31231
+  languageName: node
+  linkType: hard
+
 "@polkadot/util@npm:^13.5.6":
   version: 13.5.6
   resolution: "@polkadot/util@npm:13.5.6"
@@ -1112,6 +1145,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/util@npm:^13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/util@npm:13.5.9"
+  dependencies:
+    "@polkadot/x-bigint": "npm:13.5.9"
+    "@polkadot/x-global": "npm:13.5.9"
+    "@polkadot/x-textdecoder": "npm:13.5.9"
+    "@polkadot/x-textencoder": "npm:13.5.9"
+    "@types/bn.js": "npm:^5.1.6"
+    bn.js: "npm:^5.2.1"
+    tslib: "npm:^2.8.0"
+  checksum: 10/f3b9d66dff334e1204f3f8fecd74fe64dafec014551c99bcfde1d1270e1559fa68129fd3a47f090c6c174cdd3b9b0d9cbe95a4de4cb5172ca84c9fdd6147a0bb
+  languageName: node
+  linkType: hard
+
 "@polkadot/x-bigint@npm:13.5.6":
   version: 13.5.6
   resolution: "@polkadot/x-bigint@npm:13.5.6"
@@ -1122,6 +1170,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/x-bigint@npm:13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/x-bigint@npm:13.5.9"
+  dependencies:
+    "@polkadot/x-global": "npm:13.5.9"
+    tslib: "npm:^2.8.0"
+  checksum: 10/8b9c5f40d31a226e5222e5a837bf730fed288f2b4d525966a4f8645afc8c17919ccf8f18e7ae6452698fb8f9d92fa7c7760b275f139ba0318d20bfbadff9679e
+  languageName: node
+  linkType: hard
+
 "@polkadot/x-global@npm:13.5.6":
   version: 13.5.6
   resolution: "@polkadot/x-global@npm:13.5.6"
@@ -1131,6 +1189,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/x-global@npm:13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/x-global@npm:13.5.9"
+  dependencies:
+    tslib: "npm:^2.8.0"
+  checksum: 10/07ef477f428c73bfbdb242a4511fbbdc2c31ea2641fb577bd1ac479b6567e780a2df0a9aeb1913efe3128703c8f81366b0cf48c491d53663d3c7eff2ebcf4d2e
+  languageName: node
+  linkType: hard
+
 "@polkadot/x-textdecoder@npm:13.5.6":
   version: 13.5.6
   resolution: "@polkadot/x-textdecoder@npm:13.5.6"
@@ -1141,6 +1208,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/x-textdecoder@npm:13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/x-textdecoder@npm:13.5.9"
+  dependencies:
+    "@polkadot/x-global": "npm:13.5.9"
+    tslib: "npm:^2.8.0"
+  checksum: 10/30d7838f40181add484635c22cecf3be1b8ef53f8ff03a83f16b5bb8881332ef4952a9c564696941d3477a4c2aa83a040a6a45544d19adebf2980568cb46889b
+  languageName: node
+  linkType: hard
+
 "@polkadot/x-textencoder@npm:13.5.6":
   version: 13.5.6
   resolution: "@polkadot/x-textencoder@npm:13.5.6"
@@ -1151,24 +1228,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-ws@npm:^13.5.6":
-  version: 13.5.6
-  resolution: "@polkadot/x-ws@npm:13.5.6"
+"@polkadot/x-textencoder@npm:13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/x-textencoder@npm:13.5.9"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.6"
+    "@polkadot/x-global": "npm:13.5.9"
+    tslib: "npm:^2.8.0"
+  checksum: 10/c72352f3b603ad9d88192889901ec78088cdac4913b6c147a2b0078e230816d25f7baa0f734636bfeeecbea74c6597aa453e5b2de87e4ca0f2c02ea87a2ad376
+  languageName: node
+  linkType: hard
+
+"@polkadot/x-ws@npm:^13.5.9":
+  version: 13.5.9
+  resolution: "@polkadot/x-ws@npm:13.5.9"
+  dependencies:
+    "@polkadot/x-global": "npm:13.5.9"
     tslib: "npm:^2.8.0"
     ws: "npm:^8.18.0"
-  checksum: 10/7746aa886ae2799700e5b7c65a0e1d8c032dcc6da10c80a79bad994240fe626b760c00bae9f5f57dc784ff2329232c42abdfb444b4c15feb3b3a2a2390e9c4ea
+  checksum: 10/e7582f33452b6ab6442cf5df08a026fd5f9af3baf9028f2821e2d211322ecaae9005d3048bd46ff28e75adeb19aa9ba83c75fe4ce63ed642108a265e7ced8fbd
   languageName: node
   linkType: hard
 
-"@scure/base@npm:^1.2.6":
+"@scure/base@npm:^1.2.6, @scure/base@npm:~1.2.5":
   version: 1.2.6
   resolution: "@scure/base@npm:1.2.6"
   checksum: 10/c1a7bd5e0b0c8f94c36fbc220f4a67cc832b00e2d2065c7d8a404ed81ab1c94c5443def6d361a70fc382db3496e9487fb9941728f0584782b274c18a4bed4187
   languageName: node
   linkType: hard
 
+"@scure/bip32@npm:1.7.0, @scure/bip32@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "@scure/bip32@npm:1.7.0"
+  dependencies:
+    "@noble/curves": "npm:~1.9.0"
+    "@noble/hashes": "npm:~1.8.0"
+    "@scure/base": "npm:~1.2.5"
+  checksum: 10/f90e0c23ab6a31a164856ae9cb9a8cae2886df608c74a6c0c4875095b017e30ffd92f28f73b8c52890d9a89fca86d19f6d60bb1ea7cad64c7987f92ae83509ad
+  languageName: node
+  linkType: hard
+
+"@scure/bip39@npm:1.6.0, @scure/bip39@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@scure/bip39@npm:1.6.0"
+  dependencies:
+    "@noble/hashes": "npm:~1.8.0"
+    "@scure/base": "npm:~1.2.5"
+  checksum: 10/63e60c40fa1bda2c1b50351546fee6d7b0947cc814aa7a4209dcedd3693b5053302c8fca28292f5f50735e11c613265359acdc019127393dbab17e53489fc449
+  languageName: node
+  linkType: hard
+
 "@sigstore/bundle@npm:^1.1.0":
   version: 1.1.0
   resolution: "@sigstore/bundle@npm:1.1.0"
@@ -1350,6 +1458,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abitype@npm:1.1.0":
+  version: 1.1.0
+  resolution: "abitype@npm:1.1.0"
+  peerDependencies:
+    typescript: ">=5.0.4"
+    zod: ^3.22.0 || ^4.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+    zod:
+      optional: true
+  checksum: 10/fe445c095dcb255e32c50bb1342a49d32c03def8549347bfe7f73f54ebdc3198adf2af6366af89e1e9bd3d04beab3f22f35e099754655a6becd45e09ca30d375
+  languageName: node
+  linkType: hard
+
+"abitype@npm:^1.0.9":
+  version: 1.2.1
+  resolution: "abitype@npm:1.2.1"
+  peerDependencies:
+    typescript: ">=5.0.4"
+    zod: ^3.22.0 || ^4.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+    zod:
+      optional: true
+  checksum: 10/6e59c12db065eb47dc7e340fc0ac6a9184b71f6c8e81712ba741335f9186770c97c14f72939c315ce0a4e80514d734273c951e199202664a389a29b357e9e796
+  languageName: node
+  linkType: hard
+
 "add-stream@npm:^1.0.0":
   version: 1.0.0
   resolution: "add-stream@npm:1.0.0"
@@ -2179,7 +2317,7 @@ __metadata:
   dependencies:
     "@polkadot/types-support": "npm:^16.4.6"
     "@trivago/prettier-plugin-sort-imports": "npm:^4.1.1"
-    dedot: "npm:^0.16.0"
+    dedot: "npm:^1.0.0"
     husky: "npm:^8.0.3"
     lerna: "npm:^7.4.2"
     prettier: "npm:^3.3.3"
@@ -2189,26 +2327,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"dedot@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "dedot@npm:0.16.0"
-  dependencies:
-    "@dedot/api": "npm:0.16.0"
-    "@dedot/cli": "npm:0.16.0"
-    "@dedot/codecs": "npm:0.16.0"
-    "@dedot/contracts": "npm:0.16.0"
-    "@dedot/merkleized-metadata": "npm:0.16.0"
-    "@dedot/providers": "npm:0.16.0"
-    "@dedot/runtime-specs": "npm:0.16.0"
-    "@dedot/shape": "npm:0.16.0"
-    "@dedot/smoldot": "npm:0.16.0"
-    "@dedot/types": "npm:0.16.0"
-    "@dedot/utils": "npm:0.16.0"
-    smoldot: "npm:^2.0.38"
+"dedot@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "dedot@npm:1.0.0"
+  dependencies:
+    "@dedot/api": "npm:1.0.0"
+    "@dedot/cli": "npm:1.0.0"
+    "@dedot/codecs": "npm:1.0.0"
+    "@dedot/contracts": "npm:1.0.0"
+    "@dedot/merkleized-metadata": "npm:1.0.0"
+    "@dedot/providers": "npm:1.0.0"
+    "@dedot/runtime-specs": "npm:1.0.0"
+    "@dedot/shape": "npm:1.0.0"
+    "@dedot/smoldot": "npm:1.0.0"
+    "@dedot/types": "npm:1.0.0"
+    "@dedot/utils": "npm:1.0.0"
+    smoldot: "npm:^2.0.40"
   bin:
     dedot: bin/dedot.mjs
     djs: bin/dedot.mjs
-  checksum: 10/ff34bbee0b427afcc35a85e2649d89c8413b673570034a26a2c667496b49ce93f0347815dc04c071276e14437c67d555d48f7eb3e576a5df5ad124157ca497c5
+  checksum: 10/7a38c8187283addb229e2bdc3ac6f8c5acfdee9da0cbb51abbdcdde94f2700c0bf9367bb7ec6ce162b222990c6dbd515394448ce5876af5820dcdaa783d6e32e
   languageName: node
   linkType: hard
 
@@ -2517,6 +2655,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:5.0.1, eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 10/ac6423ec31124629c84c7077eed1e6987f6d66c31cf43c6fcbf6c87791d56317ce808d9ead483652436df171b526fc7220eccdc9f3225df334e81582c3cf7dd5
+  languageName: node
+  linkType: hard
+
 "eventemitter3@npm:^4.0.4":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
@@ -2524,13 +2669,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eventemitter3@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "eventemitter3@npm:5.0.1"
-  checksum: 10/ac6423ec31124629c84c7077eed1e6987f6d66c31cf43c6fcbf6c87791d56317ce808d9ead483652436df171b526fc7220eccdc9f3225df334e81582c3cf7dd5
-  languageName: node
-  linkType: hard
-
 "execa@npm:5.0.0":
   version: 5.0.0
   resolution: "execa@npm:5.0.0"
@@ -3537,6 +3675,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isows@npm:1.0.7":
+  version: 1.0.7
+  resolution: "isows@npm:1.0.7"
+  peerDependencies:
+    ws: "*"
+  checksum: 10/044b949b369872882af07b60b613b5801ae01b01a23b5b72b78af80c8103bbeed38352c3e8ceff13a7834bc91fd2eb41cf91ec01d59a041d8705680e6b0ec546
+  languageName: node
+  linkType: hard
+
 "jackspeak@npm:^3.1.2":
   version: 3.4.0
   resolution: "jackspeak@npm:3.4.0"
@@ -4824,6 +4971,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ox@npm:0.9.6":
+  version: 0.9.6
+  resolution: "ox@npm:0.9.6"
+  dependencies:
+    "@adraffy/ens-normalize": "npm:^1.11.0"
+    "@noble/ciphers": "npm:^1.3.0"
+    "@noble/curves": "npm:1.9.1"
+    "@noble/hashes": "npm:^1.8.0"
+    "@scure/bip32": "npm:^1.7.0"
+    "@scure/bip39": "npm:^1.6.0"
+    abitype: "npm:^1.0.9"
+    eventemitter3: "npm:5.0.1"
+  peerDependencies:
+    typescript: ">=5.4.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/9fb1a89c710c02366fe2fdda7db4e17474336456d3b80fa24e059b3d269b45e94abfe950d7f52b220abc33cde2b75d03d24f31493382a6bab37ec5aada2bd925
+  languageName: node
+  linkType: hard
+
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
@@ -5161,12 +5329,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.6.2":
-  version: 3.6.2
-  resolution: "prettier@npm:3.6.2"
+"prettier@npm:^3.7.3":
+  version: 3.7.4
+  resolution: "prettier@npm:3.7.4"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10/1213691706bcef1371d16ef72773c8111106c3533b660b1cc8ec158bd109cdf1462804125f87f981f23c4a3dba053b6efafda30ab0114cc5b4a725606bb9ff26
+  checksum: 10/b4d00ea13baed813cb777c444506632fb10faaef52dea526cacd03085f01f6db11fc969ccebedf05bf7d93c3960900994c6adf1b150e28a31afd5cfe7089b313
   languageName: node
   linkType: hard
 
@@ -5659,12 +5827,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"smoldot@npm:^2.0.38":
-  version: 2.0.38
-  resolution: "smoldot@npm:2.0.38"
+"smoldot@npm:^2.0.40":
+  version: 2.0.40
+  resolution: "smoldot@npm:2.0.40"
   dependencies:
     ws: "npm:^8.8.1"
-  checksum: 10/a0914b49ff403dc0387f34f8122339e2f91054d02baa249e4631657943490ae710aa6e95b9d203260e137eab1dea582247abeb5e2c635893270db19ffa41401c
+  checksum: 10/dfbc47c4fd15d8276e8d981cf51e147c3596878effbb7282321aac503808438dbbd6a954975bd735a37848f3ed2bf35994e27f0925231af30efc517ae0942c30
   languageName: node
   linkType: hard
 
@@ -6334,6 +6502,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"viem@npm:^2.40.3":
+  version: 2.41.2
+  resolution: "viem@npm:2.41.2"
+  dependencies:
+    "@noble/curves": "npm:1.9.1"
+    "@noble/hashes": "npm:1.8.0"
+    "@scure/bip32": "npm:1.7.0"
+    "@scure/bip39": "npm:1.6.0"
+    abitype: "npm:1.1.0"
+    isows: "npm:1.0.7"
+    ox: "npm:0.9.6"
+    ws: "npm:8.18.3"
+  peerDependencies:
+    typescript: ">=5.0.4"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/235d0a4c4f9ba27747388fdb45d7c54cd096f3b9d172179d90f6971ecbed710a0232385c37019a72812bba5e4db4be8c1a4d8381e8cb6e9210b900369f801e77
+  languageName: node
+  linkType: hard
+
 "wcwidth@npm:^1.0.0, wcwidth@npm:^1.0.1":
   version: 1.0.1
   resolution: "wcwidth@npm:1.0.1"
@@ -6495,9 +6684,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.18.0":
-  version: 8.18.0
-  resolution: "ws@npm:8.18.0"
+"ws@npm:8.18.3, ws@npm:^8.8.1":
+  version: 8.18.3
+  resolution: "ws@npm:8.18.3"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -6506,13 +6695,13 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6
+  checksum: 10/725964438d752f0ab0de582cd48d6eeada58d1511c3f613485b5598a83680bedac6187c765b0fe082e2d8cc4341fc57707c813ae780feee82d0c5efe6a4c61b6
   languageName: node
   linkType: hard
 
-"ws@npm:^8.8.1":
-  version: 8.18.3
-  resolution: "ws@npm:8.18.3"
+"ws@npm:^8.18.0":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -6521,7 +6710,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/725964438d752f0ab0de582cd48d6eeada58d1511c3f613485b5598a83680bedac6187c765b0fe082e2d8cc4341fc57707c813ae780feee82d0c5efe6a4c61b6
+  checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6
   languageName: node
   linkType: hard